summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "CTest: fix pre and post test commands with spaces" (#13887)Rolf Eike Beer2013-07-272-4/+7
| | | | | | | This reverts commit 6187876dea89618044e200808bcae75a18bd4043. It was actually possible before to have paths with spaces in them, the spaces just need to be quoted. This way spaces will work as argument separators.
* CMake Nightly Date StampKitware Robot2013-07-271-1/+1
|
* Merge topic 'tid-system-argument'Brad King2013-07-261-1/+1
|\ | | | | | | | | 9b9a596 cmTarget: Fix property name typo in docs.
| * cmTarget: Fix property name typo in docs.Stephen Kelly2013-07-251-1/+1
| |
* | Merge topic 'install-interface-relative'Brad King2013-07-265-6/+44
|\ \ | | | | | | | | | | | | d777b8e Genex: Allow relative paths in INSTALL_INTERFACE.
| * | Genex: Allow relative paths in INSTALL_INTERFACE.Stephen Kelly2013-07-255-6/+44
| | | | | | | | | | | | | | | | | | | | | These paths can be prepended with the ${_IMPORT_PREFIX} generated in the export file. Such relative paths were previously an error.
* | | Merge topic 'install-interface-includes'Brad King2013-07-2614-12/+127
|\ \ \ | |/ / | | | | | | | | | 650e61f Add a convenient way to add the includes install dir to the INTERFACE.
| * | Add a convenient way to add the includes install dir to the INTERFACE.Stephen Kelly2013-07-2414-12/+127
| | | | | | | | | | | | | | | | | | | | | Export the INCLUDES DESTINATION without appending to the INTERFACE_INCLUDE_DIRECTORIES of the target itself. That way, a target can be exported multiple times with different INCLUDES DESTINATION without unintended cross-pollution of export sets.
* | | Merge topic 'Qt4-INTERFACE_LINK_LIBRARIES'Brad King2013-07-261-0/+5
|\ \ \ | | | | | | | | | | | | | | | | 0f267c0 FindQt4: Populate the INTERFACE_LINK_LIBRARIES of IMPORTED targets.
| * | | FindQt4: Populate the INTERFACE_LINK_LIBRARIES of IMPORTED targets.Stephen Kelly2013-07-251-0/+5
| | | | | | | | | | | | | | | | | | | | This makes the IMPORTED_LINK_INTERFACE_LIBRARIES_<CONFIG> properties obsolete.
* | | | Merge topic 'doc-check-compiler-flag-override'Brad King2013-07-262-5/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 3e79d65 Check*CompilerFlag: Document use of CMAKE_REQUIRED_DEFINITIONS (#14309)
| * | | | Check*CompilerFlag: Document use of CMAKE_REQUIRED_DEFINITIONS (#14309)Brad King2013-07-252-5/+7
| |/ / / | | | | | | | | | | | | | | | | Explain how CMAKE_REQUIRED_DEFINITIONS is set before calling the check_*_source_compiles macros.
* | | | Merge topic 'sha2-avoid-type-pun'Brad King2013-07-261-4/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 6a365d0 sha2: Avoid type-punned pointer dereference (#14314)
| * | | | sha2: Avoid type-punned pointer dereference (#14314)Brad King2013-07-251-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCC warns: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] on constructs like *(sha_word64*)&var = so use memcpy to perform such assignments instead.
* | | | | CMake Nightly Date StampKitware Robot2013-07-261-1/+1
|/ / / /
* | | | Merge topic 'dev/export-target-without-language'Brad King2013-07-257-0/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 5837f19 export: Error when exporting a target without a language
| * | | | export: Error when exporting a target without a languageBen Boeckel2013-07-257-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, it prevents a NULL dereference and second it reiterates that targets without languages are not supported by CMake. Add a RunCMake.ExportWithoutLanguage test exporting a library without a languages.
* | | | | Merge topic 'doc-RunCMake-strips-expected'Brad King2013-07-251-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | c80a4f9 Tests/RunCMake: Document stripping of expected output
| * | | | Tests/RunCMake: Document stripping of expected outputBen Boeckel2013-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Document that trailing newlines are stripped from the -stdout.txt and -stderr.txt content before using as a regular expression.
* | | | | Merge topic 'tll-new-signatures'Brad King2013-07-2530-19/+407
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b655865 target_link_libraries: Add PUBLIC/PRIVATE/INTERFACE keyword signature
| * | | | | target_link_libraries: Add PUBLIC/PRIVATE/INTERFACE keyword signatureStephen Kelly2013-07-2430-19/+407
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new signature to help populate INTERFACE_LINK_LIBRARIES and LINK_LIBRARIES cleanly in a single call. Add policy CMP0023 to control whether the keyword signatures can be mixed with uses of the plain signatures on the same target.
* | | | | Merge topic 'compile-defs-debugging'Brad King2013-07-251-0/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a43e5e0 Test COMPILE_DEFINITIONS target property get/set/get round-trip
| * | | | | Test COMPILE_DEFINITIONS target property get/set/get round-tripBrad King2013-07-241-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the Preprocess test to get, set, and then get the same value for the COMPILE_DEFINITIONS target property and verify that the value is not changed. This ensures the internal structured storage of the property value can reproduce the original string value.
* | | | | | Merge topic 'fix-FindQt4-available-modules'Brad King2013-07-251-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d57c1c1 FindQt4: Re-add QAxServer to the QT_MODULES.
| * | | | | | FindQt4: Re-add QAxServer to the QT_MODULES.Stephen Kelly2013-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was removed instead of moved in commit b8af46cb (FindQt4: Don't fail if certain Qt modules are unavailable.).
* | | | | | | Merge topic 'doc-CMAKE_lang_FLAGS'Brad King2013-07-251-2/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41bb95f Document CMAKE_<LANG>_FLAGS variable (#14305)
| * | | | | | | Document CMAKE_<LANG>_FLAGS variable (#14305)Sebastian Leske2013-07-241-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already document the variables CMAKE_<LANG>_FLAGS_{DEBUG, MINSIZEREL, RELEASE, RELWITHDEBINFO}. However, CMAKE_<LANG>_FLAGS is not documented, even though it's available (and useful).
* | | | | | | | CMake Nightly Date StampKitware Robot2013-07-251-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge topic 'framework-interface-includes'Brad King2013-07-247-0/+60
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f5ca872 Use linked frameworks as a source of include directories.
| * | | | | | | Use linked frameworks as a source of include directories.Stephen Kelly2013-07-247-0/+60
| | | | | | | |
* | | | | | | | Merge topic 'dev/property-append-with-empty-string'Brad King2013-07-244-2/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31bd83e set_property: Do not remove a property when APPENDing nothing
| * | | | | | | | set_property: Do not remove a property when APPENDing nothingBen Boeckel2013-07-244-2/+15
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge topic 'FindCuda_more_search_paths'Brad King2013-07-241-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 09f00a6 FindCUDA: Search for libraries in <prefix>/lib/<arch>/nvidida-current.
| * | | | | | | | FindCUDA: Search for libraries in <prefix>/lib/<arch>/nvidida-current.Robert Maynard2013-07-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ubuntu install the CUDA libraries into a location that is different than the default location provided by the NVidia installer. So we teach the FindCUDA package to also find the Ubuntu install location.
* | | | | | | | | Merge topic 'windows_ninja_duplicate_paths'Brad King2013-07-241-18/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a11da72 Ninja: Properly convert all paths to unix style before we do set intersection.
| * | | | | | | | | Ninja: Properly convert all paths to unix style before we do set intersection.Robert Maynard2013-07-221-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On windows we had a subset of the paths as unix style and a subset as windows so when doing the set intersection it resulted in the same file being found twice.
* | | | | | | | | | Merge topic 'fix-FindQt4-available-modules'Brad King2013-07-241-18/+12
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 969e7ee FindQt4: Don't use Qt component _FOUND vars before they're defined (#14286)
| * | | | | | | | | FindQt4: Don't use Qt component _FOUND vars before they're defined (#14286)Stephen Kelly2013-07-241-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression introduced by commit b8af46cb (FindQt4: Don't fail if certain Qt modules are unavailable., 2013-05-23) The _FOUND variable is set by the _QT4_ADJUST_LIB_VARS macro, so invoke that unconditionally, and guard only the set_property calls, as described in the original bug report (#14165).
* | | | | | | | | | Merge topic 'minor-cleanups'Brad King2013-07-242-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f5b402 Remove TODO to uniq COMPILE_OPTIONS 5fb58b8 Don't add trailing whitespace to error message.
| * | | | | | | | | | Remove TODO to uniq COMPILE_OPTIONSStephen Kelly2013-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile options should not be passed through a uniq filter because repeated use of an option may have siginificance.
| * | | | | | | | | | Don't add trailing whitespace to error message.Stephen Kelly2013-07-181-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'fix-mapped-config-genex'Brad King2013-07-243-2/+61
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10a069b Genex: Fix $<CONFIG> with IMPORTED targets and multiple locations.
| * | | | | | | | | | Genex: Fix $<CONFIG> with IMPORTED targets and multiple locations.Stephen Kelly2013-07-243-2/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old code checked only that there was a LOCATION for the specified config, but did not check whether the config actually mapped. Task-number: 14292
* | | | | | | | | | | Merge topic 'remove-LINK_LANGUAGE-genex'Brad King2013-07-2413-110/+53
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f6bd70 Remove the LINK_LANGUAGE generator expression.
| * | | | | | | | | | Remove the LINK_LANGUAGE generator expression.Stephen Kelly2013-07-2413-110/+53
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It accepted an optional argument to test for equality, but no way to get the linker language of a particular target. TARGET_PROPERTY provides this flexibility and STREQUAL provides the necessary API for equality test. Extend the CompileDefinitions test to cover accessing the property of another target.
* | | | | | | | | | CMake Nightly Date StampKitware Robot2013-07-241-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2013-07-231-1/+1
| |_|_|_|_|/ / / / |/| | | | | | | |
* | | | | | | | | Merge topic 'AddCommentsToExportsFile'Brad King2013-07-221-1/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b1919f ExportTargets: add one more comment to the generated file.
| * | | | | | | | | ExportTargets: add one more comment to the generated file.Alex Neundorf2013-07-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a comment above the block which protects the exported targets file against multiple inclusion, to make the file easier to understand for readers. Alex
* | | | | | | | | | Merge topic 'rpath-on-mac'Brad King2013-07-228-22/+67
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 603bc59 OS X: Fix regression handling frameworks for Ninja e645ff0 OS X: Enable rpath support on Mac OS X when find_library() is used.