summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmGeneratorTarget: Hold a const global generator.Stephen Kelly2014-01-122-2/+2
|
* cmComputeLinkDepends: Hold a const global generator.Stephen Kelly2014-01-121-1/+1
|
* CMake Nightly Date StampKitware Robot2014-01-121-1/+1
|
* CMake Nightly Date StampKitware Robot2014-01-111-1/+1
|
* Merge topic 'remove-duplicate-file'Brad King2014-01-101-142/+0
|\ | | | | | | | | fcd5531 Tests: Remove .orig file.
| * Tests: Remove .orig file.Stephen Kelly2014-01-101-142/+0
| | | | | | | | | | Introduced in commit be0458c5 (InstallRules: added new variable to disable generation of install rules, 2013-12-25).
* | Merge topic 'minor-cleanups'Brad King2014-01-102-0/+28
|\ \ | | | | | | | | | | | | e7a111f InterfaceLibrary: Add test requiring MAP_IMPORTED_CONFIG whitelisting
| * | InterfaceLibrary: Add test requiring MAP_IMPORTED_CONFIG whitelistingStephen Kelly2014-01-092-0/+28
| | | | | | | | | | | | | | | The target properties with this prefix are whitelisted for INTERFACE_LIBRARY targets.
* | | Merge topic 'find-java-os-x-fixes'Brad King2014-01-101-0/+1
|\ \ \ | | | | | | | | | | | | | | | | 519084c FindJNI: Set JAVA_INCLUDE_PATH2 for darwin (#14508)
| * | | FindJNI: Set JAVA_INCLUDE_PATH2 for darwin (#14508)Joe Abbey2014-01-091-0/+1
| | | |
* | | | Merge topic 'CheckTypeSize_fix_multiple_invocation'Brad King2014-01-101-0/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | 8252406 CheckTypeSize: Unset temporary variables when done (#14690)
| * | | CheckTypeSize: Unset temporary variables when done (#14690)Daniele E. Domenichelli2014-01-101-0/+2
| | | | | | | | | | | | | | | | | | | | When the macro is invoked multiple times, the parsing variables were not unset and therefore used for all the following calls.
* | | | CMake Nightly Date StampKitware Robot2014-01-101-1/+1
| | | |
* | | | Merge topic 'extend-docs'Brad King2014-01-092-5/+37
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | 2f15a07 Help: Link to CMAKE_POLICY_DEFAULT_CMP<NNNN> in policies manual. bb8bde3 Help: Add notes about relocatability of config-file packages.
| * | | Help: Link to CMAKE_POLICY_DEFAULT_CMP<NNNN> in policies manual.Stephen Kelly2014-01-091-1/+3
| | | |
| * | | Help: Add notes about relocatability of config-file packages.Stephen Kelly2014-01-091-4/+34
| | |/ | |/|
* | | Merge topic 'minor-cleanups'Brad King2014-01-0923-115/+272
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 531e40b cmTarget: Make GetSourceFiles populate an out-vector parameter. 38de54c cmGeneratorTarget: Add methods to access source file groups. f579fe0 Help: Fix link to MAP_IMPORTED_CONFIG_<CONFIG> 590d238 cmTarget: Handle NO_SYSTEM_FROM_IMPORTED.
| * | | cmTarget: Make GetSourceFiles populate an out-vector parameter.Stephen Kelly2014-01-0918-33/+54
| | | | | | | | | | | | | | | | | | | | In a future patch, this will also be populated with extra sources from the linked dependencies.
| * | | cmGeneratorTarget: Add methods to access source file groups.Stephen Kelly2014-01-0911-77/+209
| | | | | | | | | | | | | | | | | | | | These methods and others will be able to get a config parameter later to implement the INTERFACE_SOURCES feature.
| * | | Help: Fix link to MAP_IMPORTED_CONFIG_<CONFIG>Stephen Kelly2014-01-081-1/+1
| | | |
| * | | cmTarget: Handle NO_SYSTEM_FROM_IMPORTED.Stephen Kelly2014-01-081-4/+8
| |/ / | | | | | | | | | | | | This handling was lost in commit faedd2be (cmTarget: Fix system include annotation propagation., 2014-01-01).
* | | Merge topic 'FindBoost-ms-debug-runtime'Brad King2014-01-091-1/+7
|\ \ \ | |_|/ |/| | | | | | | | d729899 FindBoost: Add Boost_USE_DEBUG_RUNTIME option (#14686)
| * | FindBoost: Add Boost_USE_DEBUG_RUNTIME option (#14686)Brad King2014-01-081-1/+7
| |/ | | | | | | | | Add an option to control use of the 'g' runtime debug library tag on MSVC tools. Default to ON to preserve existing behavior.
* | Merge topic 'compat-help-custom-modules'Brad King2014-01-093-2/+59
|\ \ | | | | | | | | | | | | b177294 cmake: Implement placeholder --help-custom-modules compatibility
| * | cmake: Implement placeholder --help-custom-modules compatibilityBrad King2014-01-083-2/+59
| |/ | | | | | | | | | | | | | | | | | | The implementation of the "cmake --help-custom-modules" was removed along with the rest of the old help generation infrastructure when documentation was converted to reStructuredText. In order to avoid breaking existing project builds outright when they use a custom command that runs a command like "cmake --help-custom-modules foo.1", generate the requested file with placeholder content explaining that the option is not supported anymore.
* | Merge topic 'policies'Brad King2014-01-0946-44/+405
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 73e9340 get_target_property: Error on non-existent target. ab9f58f FindQt4: Ensure target exists before calling get_target_property. 37ebeb9 FindQt4: Fix use of get_target_property to use actual target name. 6aabb6a Genex: Use case-sensitive comparison for COMPILER_ID. 5bb53f6 cmTarget: Deprecate COMPILE_DEFINITIONS_ properties with a policy.
| * | get_target_property: Error on non-existent target.Stephen Kelly2014-01-0818-1/+97
| | | | | | | | | | | | Introduce policy CMP0045 to control this behavior.
| * | FindQt4: Ensure target exists before calling get_target_property.Stephen Kelly2014-01-081-11/+15
| | | | | | | | | | | | | | | This macro is called for all potential Qt targets, even those which were not found.
| * | FindQt4: Fix use of get_target_property to use actual target name.Stephen Kelly2014-01-081-1/+1
| | | | | | | | | | | | | | | This was introduced in ba48e63f (Generate config-specific interface link libraries propeties., 2013-02-09).
| * | Genex: Use case-sensitive comparison for COMPILER_ID.Stephen Kelly2014-01-0813-1/+130
| | |
| * | cmTarget: Deprecate COMPILE_DEFINITIONS_ properties with a policy.Stephen Kelly2014-01-0823-31/+163
| | |
* | | Merge topic 'optional-install'Brad King2014-01-0920-2/+265
|\ \ \ | | | | | | | | | | | | | | | | be0458c InstallRules: added new variable to disable generation of install rules
| * | | InstallRules: added new variable to disable generation of install rulesNils Gladitz2014-01-0820-2/+265
| | | | | | | | | | | | | | | | | | | | | | | | The boolean variable CMAKE_SKIP_INSTALL_RULES allows disabling generation of install rules for projects which don't want them.
* | | | Merge topic 'vs10-include-backslashes'Brad King2014-01-091-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | c131107 VS: Convert include path to backslashes for VS >= 10
| * | | | VS: Convert include path to backslashes for VS >= 10Brad King2014-01-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In VS <= 9 we already convert include paths to use backslashes but the conversion was left out of the VS >= 10 generator. Add the conversion now for consistency. VS 11 and 12 now require it because they mistakenly interpret forward-slash options that happen to occur in paths: http://connect.microsoft.com/VisualStudio/feedback/details/778367
* | | | | Merge topic 'qt4-find-root'Brad King2014-01-091-2/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e8b8b37 FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already rooted.
| * | | | | FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already rooted.Clinton Stimpson2014-01-081-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Thanks to Thomas Petazzoni for part of this fix.
* | | | | | Merge topic 'multiarch-multios'Brad King2014-01-091-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f293d52 GNUInstallDirs: Use multiarch on Debian with FreeBSD and HURD kernels
| * | | | | | GNUInstallDirs: Use multiarch on Debian with FreeBSD and HURD kernelsDimitri John Ledkov2013-12-191-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-01-091-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge topic 'cmp0022-docs'Brad King2014-01-081-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 28ffb7e Note how to write CMP0022 compatible code with CMake 2.8.9.
| * | | | | | Note how to write CMP0022 compatible code with CMake 2.8.9.Stephen Kelly2014-01-081-0/+4
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | This has come up on the mailing list, and various other places.
* | | | | | Merge topic 'wix-cmake-package-registry'Brad King2014-01-083-1/+56
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 92c4d40 CPackWiX: added new CPACK_WIX_CMAKE_PACKAGE_REGISTRY variable
| * | | | | | CPackWiX: added new CPACK_WIX_CMAKE_PACKAGE_REGISTRY variableNils Gladitz2014-01-083-1/+56
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Allows automatic registration of installed packages with the cmake package registry.
* | | | | | Merge topic 'xcode-storyboard-file-type'Brad King2014-01-081-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e361c3c Merge branch 'xcode-storyboard-file-type-2.8.12' into xcode-storyboard-file-type 93fc5a5 Xcode: Fix storyboard view 2d23c1f Xcode: Fix storyboard view
| * \ \ \ \ \ Merge branch 'xcode-storyboard-file-type-2.8.12' into xcode-storyboard-file-typeBrad King2014-01-070-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve conflict in Source/cmGlobalXCodeGenerator.cxx by keeping our side.
| | * | | | | | Xcode: Fix storyboard viewRuslan Baratov2014-01-071-2/+4
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 56831461 (Xcode: Use explicitFileType to mark source types, 2013-04-16) the Xcode generator prefers to use explicitFileType to tell Xcode about each source file type. This works better than lastKnownFileType for some file types, but not for "file.storyboard". If storyboard file has attribute 'explicitFileType' it is displayed incorrectly (as raw xml). Switch it back to 'lastKnownFileType'.
| * | | | | | Xcode: Fix storyboard viewRuslan Baratov2014-01-071-1/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 56831461 (Xcode: Use explicitFileType to mark source types, 2013-04-16) the Xcode generator prefers to use explicitFileType to tell Xcode about each source file type. This works better than lastKnownFileType for some file types, but not for "file.storyboard". If storyboard file has attribute 'explicitFileType' it is displayed incorrectly (as raw xml). Switch it back to 'lastKnownFileType'.
* | | | | | Merge topic 'minor-cleanups'Brad King2014-01-087-54/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 884fb7f Remove obsolete workaround for old cmake versions. 5d1fc19 Help: Ensure that target-policies are added to the documentation. efc43cd Help: Fix some erroneous code block markers in Module docs.
| * | | | | | Remove obsolete workaround for old cmake versions.Stephen Kelly2014-01-071-11/+0
| | | | | | |