summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tests: test CMP0053 in WARN mode when watching variablesBen Boeckel2014-05-2211-1/+46
| | | | | | | When CMP0053 is in WARN mode, variables get expanded twice, leaking the fact that the string was expanded twice and changing behavior. Instead, suppress variable watches when running the expansion to trigger the CMP0053 warning.
* Merge topic 'ninja-intel-ipo'Brad King2014-05-228-20/+41
|\ | | | | | | | | | | | | b6e2e0d1 Ninja: Fix Intel interprocedural optimization with static libraries 5d12b87b cmGeneratorTarget: Improve GetCreateRuleVariable API c2eeb08b cmTarget: Add GetFeatureAsBool method
| * Ninja: Fix Intel interprocedural optimization with static librariesBrad King2014-05-211-2/+14
| | | | | | | | | | Teach cmGeneratorTarget::GetCreateRuleVariable about the IPO variant. Return the static library IPO rule when the feature is enabled.
| * cmGeneratorTarget: Improve GetCreateRuleVariable APIBrad King2014-05-214-18/+18
| | | | | | | | | | Pass the language and configuration to the method so it can return the complete rule variable name.
| * cmTarget: Add GetFeatureAsBool methodBrad King2014-05-214-2/+11
| | | | | | | | Return the GetFeature method result converted to a boolean value.
* | Merge topic 'COMPILE_FEATURES-genex'Brad King2014-05-2226-48/+539
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 0dfe395e Features: Add COMPILE_FEATURES generator expression. aa8a6fce cmMakefile: Add methods for checking availability of a feature. b6dedf03 cmMakefile: Extract CheckNeeded{C,Cxx}Language methods. 8dd129df cmMakefile: Extract CompileFeaturesAvailable method. 6b9b2fff cmMakefile: Extract CompileFeatureKnown method.
| * | Features: Add COMPILE_FEATURES generator expression.Stephen Kelly2014-05-2126-0/+311
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow setting build properties based on the features available for a target. The availability of features is determined at generate-time by evaluating the link implementation. Ensure that the <LANG>_STANDARD determined while evaluating COMPILE_FEATURES in the link implementation is not lower than that provided by the INTERFACE of the link implementation. This is similar to handling of transitive properties such as POSITION_INDEPENDENT_CODE.
| * | cmMakefile: Add methods for checking availability of a feature.Stephen Kelly2014-05-202-0/+120
| | |
| * | cmMakefile: Extract CheckNeeded{C,Cxx}Language methods.Stephen Kelly2014-05-202-12/+34
| | |
| * | cmMakefile: Extract CompileFeaturesAvailable method.Stephen Kelly2014-05-202-26/+41
| | |
| * | cmMakefile: Extract CompileFeatureKnown method.Stephen Kelly2014-05-202-29/+52
| | |
* | | Merge topic 'OpenBSD-paths'Brad King2014-05-221-0/+13
|\ \ \ | | | | | | | | | | | | | | | | bd32b682 OpenBSD: honor the LOCALBASE and X11BASE environment variables
| * | | OpenBSD: honor the LOCALBASE and X11BASE environment variablesRolf Eike Beer2014-05-211-0/+13
| | | |
* | | | Merge topic 'FindQt_versioned_tools'Brad King2014-05-222-8/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 0645eedb FindQt[34]: Prefer matching versioned tool names
| * | | | FindQt[34]: Prefer matching versioned tool namesRolf Eike Beer2014-05-222-8/+8
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | After finding qmake we search in QT_BINARY_DIR for the other Qt tools. Try all versioned executable names before trying the plain executable name. This makes it much more likely that if 2 different major versions are installed in the same prefix CMake will be able to detect a proper set of tools.
* | | | Merge branch 'release'Brad King2014-05-220-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'backport-kwsys-cygwin-fixes' into releaseBrad King2014-05-202-2/+11
| |\ \ \ \
| * \ \ \ \ Merge branch 'backport-fix-CMP0022-language-propagation' into releaseBrad King2014-05-192-11/+11
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'FindCUDA-separable-compilation-flags' into releaseBrad King2014-05-191-0/+9
| |\ \ \ \ \ \
* | | | | | | | CMake Nightly Date StampKitware Robot2014-05-221-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge topic 'clang-features'Brad King2014-05-216-3/+146
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cda23319 Features: Record for Clang 3.4
| * | | | | | | Features: Record for Clang 3.4Stephen Kelly2014-05-206-3/+146
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Clang 3.4 supports all features currently known to CMake.
* | | | | | | Merge topic 'GNUInstallDirs-OpenBSD'Brad King2014-05-211-8/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d4fdd9c1 GNUInstallDirs: use the proper default for info and man paths on OpenBSD
| * | | | | | | GNUInstallDirs: use the proper default for info and man paths on OpenBSDRolf Eike Beer2014-05-201-8/+20
| |/ / / / / /
* | | | | | | Merge topic 'OpenBSD_no_multilib'Brad King2014-05-211-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 956b7190 OpenBSD: disable FIND_LIBRARY_USE_LIB64_PATHS
| * | | | | | | OpenBSD: disable FIND_LIBRARY_USE_LIB64_PATHSRolf Eike Beer2014-05-201-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | OpenBSD has no multilib paths.
* | | | | | | Merge topic 'file-command-open-errors'Brad King2014-05-217-6/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c448dbf file: Report system error on failure to open file
| * | | | | | | file: Report system error on failure to open fileBrad King2014-05-207-6/+23
| |/ / / / / /
* | | | | | | Merge topic 'minor-cleanups'Brad King2014-05-213-3/+3
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1035bd5 cmTarget: Avoid copying container we don't need to copy. 96eb97f8 Help: Fix whitespace in doc link. 0dffbb93 Features: Ensure that list exists to remove from.
| * | | | | | cmTarget: Avoid copying container we don't need to copy.Stephen Kelly2014-05-201-1/+1
| | | | | | |
| * | | | | | Help: Fix whitespace in doc link.Stephen Kelly2014-05-201-1/+1
| | | | | | |
| * | | | | | Features: Ensure that list exists to remove from.Stephen Kelly2014-05-201-1/+1
| |/ / / / /
* | | | | | CMake Nightly Date StampKitware Robot2014-05-211-1/+1
| | | | | |
* | | | | | Merge topic 'backport-kwsys-cygwin-fixes'Brad King2014-05-200-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | | | | | 0c7f84ca KWSys Process: Workaround child kill trouble on Cygwin e604209c KWSys SystemTools: Port cygwin path conversion to modern API
| * | | | KWSys Process: Workaround child kill trouble on CygwinBrad King2014-05-201-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we kill a child we send SIGSTOP first so that we can traverse its child processes recursively. On unwinding the recursion we then send SIGKILL. Current Cygwin has trouble when both signals are sent in quick succession by the parent process. Add a usleep(1) after sending the first signal to give up our time slice and give Cygwin a chance to process the first signal before sending the second.
| * | | | KWSys SystemTools: Port cygwin path conversion to modern APIBrad King2014-05-201-2/+5
| |/ / / | | | | | | | | | | | | | | | | The cygwin_conv_to_win32_path function is deprecated in favor of cygwin_conv_path. Use the latter.
* | | | Merge topic 'update-kwsys'Brad King2014-05-202-2/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 2903d609 Merge branch 'upstream-kwsys' into update-kwsys ed52685d KWSys 2014-05-19 (c282e64f)
| * \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-05-192-2/+11
| |\ \ \ \
| | * | | | KWSys 2014-05-19 (c282e64f)KWSys Robot2014-05-192-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ c282e64f | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 6074f33f..c282e64f Brad King (2): 2e00d252 SystemTools: Port cygwin path conversion to modern API c282e64f Process: Workaround child kill trouble on Cygwin Change-Id: I39a3ca47fbb4065eff922d94e6d7019c417ed75c
* | | | | | Merge topic 'test-BuildDepends-sleep'Brad King2014-05-202-8/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e4114ee9 Tests/BuildDepends: Make 3-second delay more robust
| * | | | | | Tests/BuildDepends: Make 3-second delay more robustBrad King2014-05-192-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use "cmake -E sleep 3" instead of execute_process with a TIMEOUT of 3. This avoids using a busy loop or depending on a timeout to kill it.
* | | | | | | Merge topic 'preserve_cmake_minimum_required_version'Brad King2014-05-208-12/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1890c668 Keep cmake_minimum_required calls in sync with current version 81a3f228 Do not change minimum required version in modules
| * | | | | | | Keep cmake_minimum_required calls in sync with current versionDaniele E. Domenichelli2014-05-195-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update cmake_minimum_required calls in CMakeLists.txt in Modules and in CMakeLists.txt generated by other modules, so that they are always in sync with current CMake version.
| * | | | | | | Do not change minimum required version in modulesDaniele E. Domenichelli2014-05-193-7/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some modules change CMake minimum required version when they are included. For example: cmake_minimum_required(VERSION 2.8.12) message("${CMAKE_MINIMUM_REQUIRED_VERSION}") include(CheckTypeSize) message("${CMAKE_MINIMUM_REQUIRED_VERSION}") will produce the following output: 2.8.12 2.6 This patch ensures that when you include a CMake module the minimum required version and the policies set are left unchanged. Fixes Issue #14864
* | | | | | | Merge topic 'compile-features-C-language'Brad King2014-05-2057-27/+630
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e0890d03 Features: Extend concept to C language.
| * | | | | | | Features: Extend concept to C language.Stephen Kelly2014-05-1457-27/+630
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add properties and variables corresponding to CXX equivalents. Add features for c_function_prototypes (C90), c_restrict (C99), c_variadic_macros (C99) and c_static_assert (C11). This feature set can be extended later. Add a <PREFIX>_RESTRICT symbol define to WriteCompilerDetectionHeader to conditionally represent the c_restrict feature.
* | | | | | | | CMake Nightly Date StampKitware Robot2014-05-201-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'FindCUDA-separable-compilation-flags'Brad King2014-05-191-0/+9
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | 6ad14c71 FindCUDA: Use CUDA_NVCC_FLAGS* for separable compilation
| * | | | | | FindCUDA: Use CUDA_NVCC_FLAGS* for separable compilationJames Bigler2014-05-191-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when linking the intermediate link file for separable compilation the CUDA_NVCC_FLAGS* were not used. This caused tremendous confusion when using this feature, and I consider it to be a bug. This change should fix this.
* | | | | | | Merge topic 'fix-CMP0022-language-propagation'Brad King2014-05-192-8/+8
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31b3bbd7 Merge branch 'backport-fix-CMP0022-language-propagation' into fix-CMP0022-language-propagation 40b9cd0f CMP0022: Fix link language propagation in NEW behavior 42bbf130 CMP0022: Fix link language propagation in NEW behavior