summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.0.1v3.0.1Brad King2014-07-301-1/+1
|
* Merge branch 'check-flag-avoid-semicolon' into releaseBrad King2014-07-301-1/+1
|\
| * Check*CompilerFlag: Avoid ';' in common pattern (#15048)Brad King2014-07-301-1/+1
| | | | | | | | | | | | | | In commit v3.0.0-rc1~551^2~1 (Check*CompilerFlag: make C and CXX modules share most error patterns, 2013-08-08) a pattern containing a ';' was moved out of a ""-quoted argument and into a variable. CMake flattens the containing list and breaks the pattern. Use a '.' to match ';'.
* | Merge branch 'FindQt4-more-plugins' into releaseBrad King2014-07-281-3/+3
|\ \
| * | FindQt4: Add nativewifi and qtga pluginsMathieu MARACHE2014-07-281-3/+3
| |/ | | | | | | | | While at it, update QT_QTGUI_PLUGINS to use QT_IMAGEFORMATS_PLUGINS instead of duplicating the list.
* | Merge branch 'xcode-6-librarian-flags' into releaseBrad King2014-07-282-5/+24
|\ \
| * | Xcode: Fix static library creation for Xcode 6 (#15038)Brad King2014-07-282-5/+24
| |/ | | | | | | | | | | | | | | | | Xcode 6 introduced an 'OTHER_LIBTOOLFLAGS' setting for the "Other Librarian Flags" of a static library. Now 'OTHER_LDFLAGS' are ignored. Teach the Xcode generator to choose the correct name for the build setting based on the type of target and the version of Xcode. Inspired-by: Jamie Kirkpatrick <jkp@spotify.com>
* | Merge branch 'backport-kwsys-qnx-fix' into releaseBrad King2014-07-171-1/+4
|\ \
| * | KWSys SystemInformation: No SA_RESTART on QNXBob E2014-07-171-1/+4
| |/ | | | | | | | | | | | | | | QNX not support SA_RESTART signal: /* #define SA_RESTART 0x0040 (not supported yet) */ Use it in SystemInformation only if it is defined.
* | Merge branch 'compile-with-cray' into releaseBrad King2014-07-171-1/+1
|\ \
| * | cmcurl: Fix a build failure with the Cray compiler on Linux (#15026)Chuck Atkins2014-07-171-1/+1
| |/ | | | | | | | | | | | | | | | | | | The error is caused by a workaround for UNICOS. The workaround incorrectly uses the _CRAYC macro to determine if building for UNICOS. This macro will always be defined for the Cray C and C++ compiler regardless of the target platform, even when building for Linux. The correct macro should be _CRAY, which as per Cray documentation is only defined for UNICOS targeted builds.
* | Merge branch 'fix-QCC-compile-flags' into releaseBrad King2014-07-176-27/+41
|\ \
| * | QNX: Add missing flags for configurations and artifact creation.Stephen Kelly2014-07-176-27/+41
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit v3.0.0-rc1~111^2 (QNX: Introduce QCC compiler id for that QNX platform compiler., 2014-01-20) split handling of the QNX QCC compiler into a separate compiler-id. That refactoring results in the QCC compiler not using the CMake-compiler-id "GNU", which means that the __compiler_gnu macro is no longer executed for it. Add Compiler/QCC*.cmake modules to define and call the __compiler_qcc macro and teach it to call __compiler_gnu internally. Remove the corresponding pieces from the Platform/QNX*.cmake modules. It is also necessary to change the language conditional to dereference the lang macro parameter, which is another bug introduced by the same commit. The extra -lang-c++ flag is only necessary when the CXX compiler is specified as 'qcc' instead of 'QCC' in the toolchain file, which is why this bug was not noticed before. The flag is also necessary in that case when linking in order to find the appropriate standard libraries. The flag was not previously added when linking executables, so linking failed even with CMake 2.8.12 with the lower-case compiler-id. Co-Author: Brad King <brad.king@kitware.com>
* | Merge branch 'wince-fix-dll-linking' into releaseBrad King2014-07-101-4/+6
|\ \
| * | MSVC: Fix linking of DLLs on WinCE (#15013)Brad King2014-07-101-4/+6
| |/ | | | | | | | | | | | | | | On WinCE we must link both shared libraries and executables with the /subsystem:windowsce flag. Teach Platform/Windows-MSVC to pass it to the linker in both cases. Suggested-by: Gunnar Roth <gunnar.roth@gmx.de>
* | Merge branch 'install-cfbundle-directory' into releaseBrad King2014-07-101-0/+14
|\ \
| * | OS X: Install CFBundles as complete directoriesTim Blechmann2014-07-101-0/+14
| |/ | | | | | | | | Install CFBundles as directories just like frameworks and application bundles.
* | Merge branch 'CMakeExpandImportedTargets-CMP0045' into releaseBrad King2014-07-071-2/+10
|\ \
| * | CMakeExpandImportedTargets: Do not read property on non-target (#15008)Brad King2014-07-071-2/+10
| |/ | | | | | | | | Avoid behavior that is disallowed by CMP0045. Check whether a target exists before trying to read its properties.
* | Merge branch 'UseSWIG-fix-noproxy-check' into releaseBrad King2014-06-251-1/+1
|\ \
| * | UseSWIG: Fix check for noproxy flag (#14990)Brad King2014-06-251-1/+1
| |/ | | | | | | | | | | | | | | | | The check for this flag added by commit v3.0.0-rc1~284^2 (UseSWIG: Name python module according to swig flags, 2013-11-26) can get false positives on flags like "-noproxydel". Improve the check to match only "-noproxy". Suggested-by: Garth Wells <gnw20@cam.ac.uk>
* | Merge branch 'bootstrap-cmake-locations' into releaseBrad King2014-06-252-4/+12
|\ \
| * | bootstrap: Fix "make test" and "make package" targets (#14989)Brad King2014-06-252-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.0.0-rc1~374^2 (Refactor internal resource location APIs and initialization, 2013-11-07) a bootstrap-built "cmake" tries to reference "ctest" and "cpack" executables next to itself, which never exist. Teach cmSystemTools::FindCMakeResources, when bootstrap-built, to refer to the "ctest" and "cpack" executables in the location where they will be built after "make".
| * | bootstrap: Clarify name of configured source directoryBrad King2014-06-252-4/+4
| |/ | | | | | | | | Rename CMAKE_ROOT_DIR to CMAKE_BOOTSTRAP_SOURCE_DIR to clarify both that it is only for bootstrap and that it refers to the source directory.
* | Merge branch 'gfortran-compressed-modules' into releaseBrad King2014-06-231-14/+27
|\ \
| * | Fortran: Add support for GNU >= 4.9 compressed modules (#14975)Brad King2014-06-231-14/+27
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | From the GCC 4.9 release notes for Fortran: https://gcc.gnu.org/gcc-4.9/changes.html "Module files: The version of the module files (.mod) has been incremented; additionally, module files are now compressed." Teach cmDependsFortran::ModulesDiffer to look for the gzip magic numbers at the beginning of the module file. If found, assume the module was produced by gfortran >= 4.9. The modules do not appear to contain the date as earlier versions did so we can compare the content directly and do not actually need to decompress.
* | Merge branch 'ninja-avoid-double-phony' into releaseBrad King2014-06-161-0/+9
|\ \
| * | Ninja: Remove CMake includes from explicit depends (#14972)Adam Strzelecki2014-06-161-0/+9
| |/ | | | | | | | | | | | | | | | | | | It may happen that CMake include is an explicit dependency for some command, while all CMake includes are set phony in WriteTargetRebuildManifest, this may lead to duplicate phony generate rules which causes ninja warnings. We need to remove implicit CMake includes in WriteUnknownExplicitDependencies. This fixes FindCUDA ninja warnings.
* | Merge branch 'backport-fix-read-after-free' into releaseBrad King2014-06-121-5/+13
|\ \ | |/ |/|
| * cmake: Fix read-after-free while checking command-line argumentsBrad King2014-06-121-5/+13
| | | | | | | | | | | | | | | | Since commit v2.8.12~300^2~1 (CLI: Suppress the unused warning if the key value pair is cached, 2013-05-16), cmake::SetCacheArgs saves a cachedValue pointer and may cause the memory to be freed (by setting the cache entry) before reading it again. Fix this by saving the old value in a separate string.
* | CMake 3.0.0v3.0.0Brad King2014-06-091-1/+1
|/
* Merge branch 'hpux-libarchive-compile' into releaseBrad King2014-06-091-12/+14
|\
| * libarchive: fix compilation on newer HP-UX versionsRolf Eike Beer2014-06-091-12/+14
|/ | | | | | | Newer HP-UX versions (e.g. 11.31) also offers F_SETTIMES, but with a different struct for the timing information. Suggested-by: Eric Berge <ericmberge@gmail.com>
* Merge branch 'fix-ctest-option-summary' into releaseBrad King2014-06-051-1/+2
|\
| * CTest: Added option description for --output-on-failureNils Gladitz2014-06-051-1/+2
| | | | | | | | Without it the option list is cut short after --debug.
* | Merge branch 'fix-build-crash-on-bad-generator' into releaseBrad King2014-06-0310-1/+21
|\ \
| * | cmake: Fix --build crash on bad CMAKE_GENERATOR in cacheBrad King2014-06-0310-1/+21
| |/ | | | | | | | | | | | | | | | | | | If we fail to create the generator named by CMAKE_GENERATOR, exit with an error message instead of crashing. While at it, fix the wording of the error message when CMAKE_GENERATOR is not set. Extend the RunCMake.CommandLine test with cases covering the "cmake --build" option when the named directory does not provide a CMakeCache.txt with a valid CMAKE_GENERATOR.
* | Merge branch 'cmake-credits' into releaseBrad King2014-06-031-1/+1
|\ \
| * | Simplify and clarify credit text and linkBrad King2014-06-031-1/+1
| | | | | | | | | | | | | | | Use the name "Kitware" rather than "Kitware, Inc." to simplify the text. Provide a CMake-specific URL.
* | | Merge branch 'cmake-credits' into releaseBrad King2014-06-033-5/+5
|\ \ \ | |/ /
| * | Simplify and clarify credit text and linkBrad King2014-06-033-5/+5
| |/ | | | | | | | | Use the name "Kitware" rather than "Kitware, Inc." to simplify the text. Provide a CMake-specific URL.
* | Merge branch 'doc-include-dir-props' into releaseBrad King2014-06-023-3/+45
|\ \
| * | Help: Explain build/install-tree include dirs in more places (#14946)Brad King2014-06-023-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain how to use $<BUILD_INTERFACE> and $<INSTALL_INTERFACE> directly in the documentation of the target_include_directories command and INTERFACE_INCLUDE_DIRECTORIES target property. Otherwise readers need to notice the link to the cmake-buildsystem(7) manual and find the example in that to understand the need for these expressions. Also fix the explanation in cmake-buildsystem(7) to not claim that relative paths may be used inside a BUILD_INTERFACE expression.
| * | Help: Add code example for INSTALL_INTERFACE to cmake-buildsystem.Stephen Kelly2014-06-021-1/+11
| |/
* | Merge branch 'fix-cache-self-assignment' into releaseBrad King2014-05-272-6/+5
|\ \
| * | cmCacheManager: Avoid cache entry self-assignmentBrad King2014-05-271-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit bef93dc5 (Couple of changes: cache variables now have a map of properties, 2002-09-11) the cmCacheManager::AddCacheDefinition method accesses its map entry by reference. However, the commit left the original entry assignment at the end of the method. With Apple Clang 5.1 and libc++ this self-assignment destroys the cache entry property map. Drop the self assignment. Also drop the condition around the call to UnwatchUnusedCli since it was a self-comparison that must always have been true.
| * | cmake: Tolerate missing HELPSTRING on compiler changeBrad King2014-05-271-1/+4
| |/ | | | | | | | | | | Teach cmake::HandleDeleteCacheVariables to tolerate a missing HELPSTRING (NULL pointer) when saving cache entries. In the absence of other bugs this should not be possible, but avoid the crash just in case.
* | Merge branch 'GNUtoMS-vs-12' into releaseBrad King2014-05-271-1/+3
|\ \ | |/ |/|
| * GNUtoMS: Add support for VS 2013 (#14936)Brad King2014-05-271-1/+3
|/ | | | | | Add to the Platform/Windows-GNU module list of VS registry entries those for VS 2013. Also add the name "vcvars64.bat" used by VS 10 and above for 64-bit tools.
* CMake 3.0.0-rc6v3.0.0-rc6Brad King2014-05-221-1/+1
|