summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* build_command: Fail early without CMAKE_MAKE_PROGRAM (#14005)Brad King2013-03-126-1/+23
| | | | | | If CMAKE_MAKE_PROGRAM is not set fail with an error message instead of crashing. Suggest calling project() or enable_language() first to ensure that CMAKE_MAKE_PROGRAM is set.
* Refactor RunCMake.build_command test to allow more casesBrad King2013-03-125-59/+69
| | | | | | Move the ErrorsOFF/ON common logic from CMakeLists.txt into an ErrorsCommon file to allow other test cases to be added that do not use the Errors test logic.
* Merge topic 'findqt4-withqt5'Brad King2013-03-121-36/+53
|\ | | | | | | | | 2112341 FindQt4: Do not use qmake from Qt5
| * FindQt4: Do not use qmake from Qt5Janne Rönkkö2013-03-121-36/+53
| | | | | | | | | | | | | | | | | | Wihtout this, if qmake binary is from Qt5 the FindQt4 fails even though the Qt4 version of qmake would be installed as qmake-qt4. On Archlinux this is the case. Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
* | Merge topic 'aix-shared-flags'Brad King2013-03-122-2/+2
|\ \ | | | | | | | | | | | | bce7a2a AIX: Do not use -brtl to create shared libraries (#13997)
| * | AIX: Do not use -brtl to create shared libraries (#13997)Brad King2013-03-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flag was added incorrectly by commit 9c3a6eb4 (Need -brtl when creating shared libraries, 2003-05-16). According to "man ld" the -G option implies "-brtl -bnortllib ...", -brtl implies "-brtllib", and -brtllib should only be used for executables, not shared libraries. Therefore it is incorrect and unnecessary to specify -brtl explicitly after -G. Reported-by: Kevin Burge <kcburge@gmail.com>
* | | Merge topic 'ninja-mingw-lang'Brad King2013-03-124-86/+46
|\ \ \ | | | | | | | | | | | | | | | | | | | | 2271ca3 Ninja: the Ninja generator does not support Fortran yet. 751f712 Ninja: use MinGW generator code in EnableLanguage()
| * | | Ninja: the Ninja generator does not support Fortran yet.Peter Kümmel2013-03-101-5/+11
| | | |
| * | | Ninja: use MinGW generator code in EnableLanguage()Peter Kümmel2013-03-094-84/+38
| | | |
* | | | Merge topic 'install-export-usr-move'Brad King2013-03-122-9/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 0c727b9 install(EXPORT): Force absolute paths for usr-move
| * | | | install(EXPORT): Force absolute paths for usr-moveBrad King2013-03-082-9/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the absolute install(EXPORT) destination for the CMAKE_INSTALL_PREFIX used during configuration is under (/usr)?/lib(64)? then assume the current build is for a system package installation instead of a relocatable distribution. Generate an absolute path for _IMPORT_PREFIX in the target exports file instead of generating code to compute the value relative to the file location. This is necessary for distributions implementing a move to /usr such as: https://wiki.archlinux.org/index.php/DeveloperWiki:usrlib "All files in the /lib directory have been moved to /usr/lib and now /lib is a symlink to usr/lib." The relative path computation is not reliable because the targets file could be installed through cross-prefix a symlink and loaded without it or vice versa. A similar change was made for package configuration file generation by commit d4774140 (configure_package_config_file: force absolute paths for usr-move, 2013-01-24).
* | | | | Merge topic 'vs7-empty-groups'Brad King2013-03-122-8/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 545fdec VS: Avoid empty source groups in some cases (#3474)
| * | | | | VS: Avoid empty source groups in some cases (#3474)Anton Helwart2013-03-082-8/+22
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Teach the WriteGroup method return true if a group or any of its children have source files. Have children write their output to a temporay cmOStringStream. Add it to the real output only if not empty.
* | | | | Merge topic 'cpack-nsis-no-release-version'Brad King2013-03-121-12/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7947890 CPack: Fix NSIS version check without release version (#9721)
| * | | | | CPack: Fix NSIS version check without release version (#9721)Gerald Hofmann2013-03-081-12/+24
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only check a release version for the minimum required version. If NSIS returns a CVS build version string (as when built by Macports), skip the version check altogether and assume a sufficiently new version. Also correctly handle the case where the version check fails and the CPACK_TOPLEVEL_DIRECTORY option is not set. Co-Author: Graham Menhennitt <graham@menhennitt.com.au>
* | | | | Merge topic 'fix-transitive-target-names'Brad King2013-03-124-3/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bdd167 Restore support for target names with '+' (#13986) 254687d Only process transitive interface properties for valid target names.
| * | | | | Restore support for target names with '+' (#13986)Stephen Kelly2013-03-123-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the range of valid target names with the + sign. This character can commonly be used for target names, such as those containing 'c++'. Add a test but skip it for Borland and Watcom tools which do not support the character. Suggested-By: Benjamin Kloster
| * | | | | Only process transitive interface properties for valid target names.Stephen Kelly2013-03-061-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit a1c4905f (Use the link information as a source of compile definitions and includes., 2013-02-12) introduced the use of link information as the source of target properties via the TARGET_PROPERTY generator expression. This generator expression has a strict interpretation of a valid target name and emits a fatal error for invalid names. Ensure that only targets with names valid for use with TARGET_PROPERTY or targets which are determined by generator expressions are processed by it. This means that at worst, invalid target names do not participate in the transitive evaluation of properties, but the validation generator expression can be extended where needed to resolve that.
* | | | | | Merge topic 'clean-target_link_libraries-test'Brad King2013-03-123-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | adcc00b Remove unused parameters from target_link_libraries tests.
| * | | | | | Remove unused parameters from target_link_libraries tests.Stephen Kelly2013-03-063-3/+3
| |/ / / / /
* | | | | | Merge topic 'update-find_package-docs'Brad King2013-03-121-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b73e05d Mention that IMPORTED targets may be created by a find_package call.
| * | | | | | Mention that IMPORTED targets may be created by a find_package call.Stephen Kelly2013-03-061-1/+2
| | | | | | |
* | | | | | | Merge topic 'Win-HOST_SYSTEM_PROCESSOR'Brad King2013-03-121-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20681c9 fix Windows processor detection
| * | | | | | | fix Windows processor detectionRolf Eike Beer2013-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Martin Koller for this.
* | | | | | | | Merge topic 'FindCUDA.cmake/AddCUDA_cupti_LIBRARY'Brad King2013-03-121-7/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c939b49 FindCUDA: Added cupti library.
| * | | | | | | | FindCUDA: Added cupti library.James Bigler2013-03-121-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition to adding the cupti library, find_local_library_first has been renamed to cuda_find_local_library_first with a backward compatibility macro to find_local_library_first. Also added cuda_find_local_library_first_with_path_ext to handle different paths.
* | | | | | | | | Merge topic 'FindCUDA.cmake/SeparableCompilation'Brad King2013-03-121-1/+150
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a19150 FindCUDA: Add support for separable compilation
| * | | | | | | | | FindCUDA: Add support for separable compilationJames Bigler2013-03-121-1/+150
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new variable, CUDA_SEPARABLE_COMPILATION, and two new functions, CUDA_COMPUTE_SEPARABLE_COMPILATION_OBJECT_FILE_NAME and CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS. When CUDA_SEPARABLE_COMPILATION is specified then CUDA runtime objects will be compiled with the separable compilation flag. These object files are collected in a target named variable that can be used in CUDA_COMPUTE_SEPARABLE_COMPILATION_OBJECT_FILE_NAME and CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS.
* | | | | | | | | Merge topic 'FindCUDA.cmake/DontLinkAgainstCUDADriver'Brad King2013-03-121-5/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3497bc2 FindCUDA: Remove linkage against CUDA driver library (#13084)
| * | | | | | | | | FindCUDA: Remove linkage against CUDA driver library (#13084)James Bigler2013-03-121-5/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CUDA runtime library (libcudart) doesn't depend on the driver API library (libcuda) and shouldn't be used to link CUDA run time codes.
* | | | | | | | | Merge topic 'FindImageMagick-v6.8.0-8'Brad King2013-03-121-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5fe9855 FindImageMagick: Search quantum depth suffixes (#13859)
| * | | | | | | | | FindImageMagick: Search quantum depth suffixes (#13859)Slava Sysoltsev2013-03-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From ImageMagick's 6.8.0-8 changelog: http://www.imagemagick.org/script/changelog.php ABI is incompatible if quantum depth change. Add abi indication to library name. Search for library names with -Q16 and -Q8 suffixes. Reported-by: Evangelos Foutras <evangelos@foutrelis.com>
* | | | | | | | | | CMake Nightly Date StampKitware Robot2013-03-121-1/+1
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2013-03-111-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2013-03-101-1/+1
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2013-03-091-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-03-081-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-03-071-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-03-061-1/+1
| | | | | |
* | | | | | Merge topic 'FixPreLinkTest'Brad King2013-03-051-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ab1259 Use PRE_LINK instead of PRE_BUILD when testing PRE_LINK.
| * | | | | | Use PRE_LINK instead of PRE_BUILD when testing PRE_LINK.James Bigler2013-03-041-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'vs10-stack-size'Brad King2013-03-051-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 308c5a2 VS 10: Fix CMAKE_<LANG>_STACK_SIZE implementation (#13968)
| * | | | | | VS 10: Fix CMAKE_<LANG>_STACK_SIZE implementation (#13968)Brad King2013-03-041-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the /STACK: flag to pass the value through flag parsing so that the generator converts it to the StackReserveSize project file option. The option was accidentally left out by commit 7491f529 (first pass at VS 10, 2009-06-25). Suggested-by: goatboy160@yahoo.com
* | | | | | CMake Nightly Date StampKitware Robot2013-03-051-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'GetPrerequisites-objdump'Brad King2013-03-042-19/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12fb50d GetPrerequisites: Add documentation for objdump 8eb2fe9 GetPrerequisites: Enable test for BundleUtilities on MinGW 33c94c8 GetPrerequisites: Add support for objdump 5260a86 GetPrerequisites: Move tool search paths up
| * | | | | GetPrerequisites: Add documentation for objdumpMichael Tänzer2013-03-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Tänzer <neo@nhng.de>
| * | | | | GetPrerequisites: Enable test for BundleUtilities on MinGWMichael Tänzer2013-03-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Tänzer <neo@nhng.de>
| * | | | | GetPrerequisites: Add support for objdumpMichael Tänzer2013-02-281-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it usable on MinGW without Visual Studio installed. Signed-off-by: Michael Tänzer <neo@nhng.de>
| * | | | | GetPrerequisites: Move tool search paths upMichael Tänzer2013-02-281-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make them usable in the gp_tool selection heuristic. Signed-off-by: Michael Tänzer <neo@nhng.de>
* | | | | | Merge topic 'fix-genex-RPATH-handling'Brad King2013-03-043-6/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | dcb5907 Fix RPATH information when only a genex is used as a link library.