summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-INTERFACE-with-no-SHARED-libs'Brad King2013-11-134-0/+8
|\ | | | | | | | | 64f73b0 add_library: Fix INTERFACE on platforms with no shared libs (#14561)
| * add_library: Fix INTERFACE on platforms with no shared libs (#14561)Stephen Kelly2013-11-124-0/+8
| |
* | Merge topic 'wix-custom-arguments'Brad King2013-11-133-7/+96
|\ \ | | | | | | | | | | | | 096591b CPackWiX: Add variables for custom tool extensions and flags
| * | CPackWiX: Add variables for custom tool extensions and flagsNils Gladitz2013-11-123-7/+96
| | |
* | | Merge topic 'cleanup-edit_cache-target'Brad King2013-11-1313-116/+73
|\ \ \ | | | | | | | | | | | | | | | | | | | | 684063c Refactor tool selection for edit_cache (#14544) eaf5b7a cmGlobalGenerator: Do not propagate const through GetCMakeInstance
| * | | Refactor tool selection for edit_cache (#14544)Brad King2013-11-1213-114/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor edit_cache tool selection to ask each global generator for its preference. Teach the Ninja generator to always use cmake-gui because Ninja by design cannot run interactive terminal dialogs like ccmake. Teach the Makefile generator to use cmake-gui when also using an "extra" generator whose IDE has no terminal to run ccmake, and otherwise fall back to CMAKE_EDIT_COMMAND selection for normal Makefile build systems.
| * | | cmGlobalGenerator: Do not propagate const through GetCMakeInstanceBrad King2013-11-121-2/+1
| | | | | | | | | | | | | | | | | | | | Combine the const and non-const GetCMakeInstance to a const one and return a pointer to non-const cmake from it.
* | | | CMake Nightly Date StampKitware Robot2013-11-131-1/+1
|/ / /
* | | Merge topic 'pp-transitive-property-handling'Brad King2013-11-123-23/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | 77a0fd5 Genex: Use a preprocessor foreach to follow transitive properties. 1464933 Genex: Simplify the preprocessor looper for interface properties.
| * | | Genex: Use a preprocessor foreach to follow transitive properties.Stephen Kelly2013-11-091-17/+12
| | | |
| * | | Genex: Simplify the preprocessor looper for interface properties.Stephen Kelly2013-11-093-6/+6
| | | | | | | | | | | | | | | | By removing the INTERFACE_ prefix, we can use this in more contexts.
* | | | Merge topic 'constify'Brad King2013-11-124-29/+25
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | dcac9be Make accessors for compile-related information const. 19a8a3c cmTarget: Don't finalize include directories in GetIncludeDirectories. 3305364 cmGlobalGenerator: Rename the FinalizeCompileDefinitions method.
| * | | Make accessors for compile-related information const.Stephen Kelly2013-11-092-19/+20
| | | | | | | | | | | | | | | | These can be moved to cmGeneratorTarget in CMake 4.0.
| * | | cmTarget: Don't finalize include directories in GetIncludeDirectories.Stephen Kelly2013-11-072-7/+2
| | | | | | | | | | | | | | | | Rely on that having been done by the cmGlobalGenerator.
| * | | cmGlobalGenerator: Rename the FinalizeCompileDefinitions method.Stephen Kelly2013-11-072-3/+3
| | | | | | | | | | | | | | | | This will soon also finalize include directories.
* | | | Merge topic 'cmake-internal-locations'Brad King2013-11-1226-350/+212
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d1526f8 Refactor internal resource location APIs and initialization
| * | | | Refactor internal resource location APIs and initializationBrad King2013-11-1226-350/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename cmSystemTools::FindExecutableDirectory to FindCMakeResources. Teach it to compute the locations of cmake, ctest, cpack, ccmake, and cmake-gui executables, and the location of CMAKE_ROOT. Provide this information from static cmSystemTools::Get<resource>() methods. Refactor code that needs these locations to use the new APIs. Teach FindCMakeResources to use the OS X system API to lookup the executable location. When running from the CMake build tree itself, leave a file in the tree that FindCMakeResources can use to read the location of the source tree. This avoids the need to compile the source tree location into a binary that may be installed and used without the source tree. Teach the QtDialog on OS X to create a "cmake-gui" symlink in the build tree next to "cmake" and the other tools, as is already done in the install tree for the application bundle. This ensures a consistent set of executables are available in one directory.
* | | | | Merge topic 'test-RunCMake.CMP0037-everywhere'Brad King2013-11-1219-92/+99
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8c6c1f1 Enable RunCMake.CMP0037 test everywhere
| * | | | | Enable RunCMake.CMP0037 test everywhereBrad King2013-11-1119-92/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split the test cases covering spaces and colons into separate units. Run the space cases everywhere. Disable the colon cases where they are known to fail. This approach increases platform coverage for the test and makes the known-failure logic as local as possible. No Makefile generator on Windows can generate targets with ':' in their name because the CMakeFiles/<target>.dir directory cannot be created. Skip this part of the test on all Windows Make tools.
* | | | | | Merge topic 'clear-generator-data'Brad King2013-11-122-1/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00055ce cmExportSetMap: Override clear() to delete held resources
| * | | | | | cmExportSetMap: Override clear() to delete held resourcesBrad King2013-11-082-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the std::map<>::clear() method with one that first deletes the cmExportSet instances held by each map entry, and then clears. Otherwise the cmGlobalGenerator::ClearGeneratorMembers added by commit 5cf1120f (cmGlobalGenerator: Refactor member cleanup between configures, 2013-11-04) leaks the cmExportSet instances.
* | | | | | | CMake Nightly Date StampKitware Robot2013-11-121-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-11-111-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2013-11-101-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2013-11-091-1/+1
| | | | |
* | | | | Merge topic 'test-LINK_ONLY-expression'Brad King2013-11-084-5/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 53b10fd Genex: Add a test for the LINK_ONLY expression.
| * | | | | Genex: Add a test for the LINK_ONLY expression.Stephen Kelly2013-11-064-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 239b0c6b (Don't add invalid content to static lib INTERFACE_LINK_LIBRARIES., 2013-10-20) extended a test which excercised the logic of the LINK_ONLY generator expression. Commit ef10b87c (CMP0022: Plain target_link_libraries must populate link interface, 2013-11-02) removed the instance of LINK_ONLY which was excercised by that test. Add a new test which excercises the other instance of LINK_ONLY by setting the CMP0022 policy to NEW and consuming the contents of the INTERFACE_LINK_LIBRARIES target property.
* | | | | | Merge topic 'tll-target-policies'Brad King2013-11-0846-7/+437
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 596b2a8 Disallow linking to utility targets (#13902). 301bb5c Disallow link-to-self (#13947). 05f5fde Disallow invalid target names (#13140)
| * | | | | Disallow linking to utility targets (#13902).Stephen Kelly2013-11-0717-0/+106
| | | | | |
| * | | | | Disallow link-to-self (#13947).Stephen Kelly2013-11-0718-7/+105
| | | | | |
| * | | | | Disallow invalid target names (#13140)Stephen Kelly2013-11-0719-0/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude Borland and NMake from the CMP0037 test. They do not accept the colon in a target name.
* | | | | | Merge topic 'doc-cmake-language'Brad King2013-11-083-2/+474
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79fd233 Help: Reference cmake-language.7 comment docs from cmake-developer.7 a931ee4 Help: Add cmake-language.7 manual
| * | | | | | Help: Reference cmake-language.7 comment docs from cmake-developer.7Brad King2013-11-081-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cmake-language.7 manual now documents comment syntax. Reference it from cmake-developer.7 when discussing how to add comment-enclosed documentation to modules.
| * | | | | | Help: Add cmake-language.7 manualBrad King2013-11-082-0/+471
| | | | | | |
* | | | | | | Merge topic 'doc-execute_process'Brad King2013-11-081-26/+53
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 3bb6266 Help: Clarify execute_process COMMAND argument behavior ea6b656 Help: Format execute_process command documentation
| * | | | | | Help: Clarify execute_process COMMAND argument behaviorBrad King2013-11-071-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | State in the execute_process how COMMAND arguments are passed to the child. Add a note at the end about how the command differs from add_custom_*(). Suggested-by: Alan W. Irwin
| * | | | | | Help: Format execute_process command documentationBrad King2013-11-071-26/+39
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Use a code-block for the signature. Format the options as a definition list.
* | | | | | CMake Nightly Date StampKitware Robot2013-11-081-1/+1
|/ / / / /
* | | | | Merge topic 'cfbundle-test-no-cl-tools'Brad King2013-11-071-1/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | a5aadcd CFBundle test: Add isysroot argument when calling Rez.
| * | | | CFBundle test: Add isysroot argument when calling Rez.Clinton Stimpson2013-11-061-1/+7
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2013-11-071-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'release'Brad King2013-11-061-0/+26
|\ \ \ \
| * | | | CMake 2.8.12.1v2.8.12.1Brad King2013-11-052-1/+27
| | | | |
| * | | | Merge branch 'fix-automoc-compile-definitions' into releaseBrad King2013-11-053-5/+25
| |\ \ \ \
| * \ \ \ \ Merge branch 'cmake-E-automoc-crash' into releaseBrad King2013-11-051-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'clear-evaluation-files' into releaseBrad King2013-11-041-0/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'policy-CMP0022-fixes' into releaseBrad King2013-11-0426-126/+293
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'object-library-no-TARGET_FILE' into releaseBrad King2013-11-026-1/+36
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'object-library-missing-source' into releaseBrad King2013-11-025-0/+13
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'vs12-parallel-cl-FS' into releaseBrad King2013-11-023-1/+7
| |\ \ \ \ \ \ \ \ \ \