summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | | | | | | OS X: Fix regression handling frameworks for NinjaClinton Stimpson2013-07-222-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a regression created by commit 373faae5 (Refactor how bundles and frameworks are supported, 2013-05-05). Since the ninja file isn't aware of how framework symlinks work, we suppress symlink creation and let cmOSXBundleGenerator handle it. Also, use the real name of framework library in build rules as was done before, instead of the symlink.
| * | | | | | | | OS X: Enable rpath support on Mac OS X when find_library() is used.Clinton Stimpson2013-07-166-19/+56
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge topic 'SelectLibraryConfigurations'Brad King2013-07-222-45/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 04d4dc3 SelectLibraryConfigurations: Use -NOTFOUND instead of copying the vars 07b44e7 SelectLibraryConfigurations: Do not cache the _LIBRARY variable
| * | | | | | | | SelectLibraryConfigurations: Use -NOTFOUND instead of copying the varsDaniele E. Domenichelli2013-07-222-41/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If one of the libraries (_DEBUG or _RELEASE) is not set, the value is set to the value of the other one. FindQt4, from which the macro is extracted, sets the values to XXX_LIBRARY_{DEBUG,RELEASE}-NOTFOUND instead. In both cases the XXX_LIBRARY is correct, but using NOTFOUND makes it easier to understand which one is missing. Update Tests/CMakeOnly/SelectLibraryConfigurations with the new logic.
| * | | | | | | | SelectLibraryConfigurations: Do not cache the _LIBRARY variableDaniele E. Domenichelli2013-07-101-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SelectLibraryConfigurations module currently cache and mark as advanced the variable ${basename}_LIBRARY. ${basename}_LIBRARY_RELEASE and ${basename}_LIBRARY_DEBUG are usually cached, because they often come from find_library(). ${basename}_LIBRARY on the other hand is always of type "optimized;${${basename}_LIBRARY_RELEASE};debug;${${basename}_LIBRARY_DEBUG}" or just "${basename}_LIBRARY_RELEASE" or "${basename}_LIBRARY_DEBUG" if only one version of the library is not found, if both have the same value, or if configuration types are not supported. Caching and marking as advanced just ${basename}_LIBRARY_RELEASE and ${basename}_LIBRARY_DEBUG is enough, just by modifying these two variables, the user has enough control on finding the library, and having 3 variables is redundant and confusing.
* | | | | | | | | Merge topic 'cpack-wix'Brad King2013-07-225-13/+164
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf23891 CPackWIX: Add support for custom WiX templates 155bb01 CMakeCPack: Provide an upgrade guid for WiX bfa2e29 CPackWIX: Add option to specify the language(s) of the installer 6e51ea9 CPackWIX: Handle multiple shortcuts in the start menu 6d77e1a CPackWIX: Fix MSI package layout regression from parent 8c0e325 CPackWIX: Handle CPACK_PACKAGE_EXECUTABLES (#13967)
| * | | | | | | | | CPackWIX: Add support for custom WiX templatesAdam J. Weigold2013-07-192-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WiX provides a lot of functionality for installers that cannot be supported (easily) in the default WIX.template.in file. For most users, the default template should be fine. However if users want to produce merge modules, include custom actions, etc, this new option allows for a hook into how the wxs is produced.
| * | | | | | | | | CMakeCPack: Provide an upgrade guid for WiXRichard Ulrich2013-07-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set CPACK_WIX_UPGRADE_GUID. Without this upgrade GUID, you end up with multiple instances of the same installation when installing cmake from a WIX generated installer.
| * | | | | | | | | CPackWIX: Add option to specify the language(s) of the installerRichard Ulrich2013-07-192-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option "CPACK_WIX_CULTURES".
| * | | | | | | | | CPackWIX: Handle multiple shortcuts in the start menuRichard Ulrich2013-07-191-7/+13
| | | | | | | | | |
| * | | | | | | | | CPackWIX: Fix MSI package layout regression from parentIan Monroe2013-07-191-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parent commit added a regression where if the install directory had: parent child A child B the produced MSI would install: parent child A child B
| * | | | | | | | | CPackWIX: Handle CPACK_PACKAGE_EXECUTABLES (#13967)Fredrik Axelsson2013-07-194-10/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add start menu items including an uninstall shortcut. Add variable CPACK_WIX_PROGRAM_MENU_FOLDER to configure folder name.
* | | | | | | | | | Merge topic 'mingw-in-codeblocks'Brad King2013-07-221-1/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9cdc5e6 MinGW: Find mingw32-make included with Code::Blocks IDE (#14302)
| * | | | | | | | | MinGW: Find mingw32-make included with Code::Blocks IDE (#14302)Jason Spiro2013-07-191-1/+3
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If one installs MinGW using the Code::Blocks IDE installer it goes to a path like "c:\Program Files\CodeBlocks\MinGW", not "c:\MinGW". Use the CodeBlocks registry entry to get the location. Signed-off-by: Jason Spiro <jasonspiro4@gmail.com>
* | | | | | | | | CMake Nightly Date StampKitware Robot2013-07-221-1/+1
| | | | | | | | |
generated by cgit v0.12 at 2024-11-01 00:52:15 (GMT)