Stephen Kelly
b4ff38a5ef
cmGlobalGenerator: Make CheckALLOW_DUPLICATE_CUSTOM_TARGETS const
2014-01-12 20:18:11 +01:00
Stephen Kelly
8aeddf1f03
cmGlobalGenerator: Make some API const.
2014-01-12 20:18:11 +01:00
Stephen Kelly
8fd0f2a718
cmGeneratorTarget: Hold a const global generator.
2014-01-12 20:18:11 +01:00
Stephen Kelly
46315320ab
cmComputeLinkDepends: Hold a const global generator.
2014-01-12 20:18:10 +01:00
Kitware Robot
325ca1f253
CMake Nightly Date Stamp
2014-01-12 00:01:04 -05:00
Kitware Robot
cb7af7af44
CMake Nightly Date Stamp
2014-01-11 00:01:24 -05:00
Brad King
674bfadef0
Merge topic 'remove-duplicate-file'
...
fcd5531
Tests: Remove .orig file.
2014-01-10 09:19:51 -05:00
Brad King
f2641ac3e0
Merge topic 'minor-cleanups'
...
e7a111f
InterfaceLibrary: Add test requiring MAP_IMPORTED_CONFIG whitelisting
2014-01-10 09:19:49 -05:00
Brad King
aacad3238f
Merge topic 'find-java-os-x-fixes'
...
519084c
FindJNI: Set JAVA_INCLUDE_PATH2 for darwin (#14508 )
2014-01-10 09:19:46 -05:00
Brad King
58b34959e3
Merge topic 'CheckTypeSize_fix_multiple_invocation'
...
8252406
CheckTypeSize: Unset temporary variables when done (#14690 )
2014-01-10 09:19:44 -05:00
Daniele E. Domenichelli
8252406cd6
CheckTypeSize: Unset temporary variables when done ( #14690 )
...
When the macro is invoked multiple times, the parsing variables were
not unset and therefore used for all the following calls.
2014-01-10 09:16:30 -05:00
Stephen Kelly
fcd5531004
Tests: Remove .orig file.
...
Introduced in commit be0458c5
(InstallRules: added new variable to
disable generation of install rules, 2013-12-25).
2014-01-10 10:29:36 +01:00
Kitware Robot
00f53bc260
CMake Nightly Date Stamp
2014-01-10 00:01:12 -05:00
Brad King
98bdd78afc
Merge topic 'extend-docs'
...
2f15a07
Help: Link to CMAKE_POLICY_DEFAULT_CMP<NNNN> in policies manual.
bb8bde3
Help: Add notes about relocatability of config-file packages.
2014-01-09 16:26:30 -05:00
Stephen Kelly
e7a111f094
InterfaceLibrary: Add test requiring MAP_IMPORTED_CONFIG whitelisting
...
The target properties with this prefix are whitelisted for
INTERFACE_LIBRARY targets.
2014-01-09 20:11:42 +01:00
Brad King
e56530f612
Merge topic 'minor-cleanups'
...
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.
2014-01-09 13:54:23 -05:00
Brad King
089ae7122b
Merge topic 'FindBoost-ms-debug-runtime'
...
d729899
FindBoost: Add Boost_USE_DEBUG_RUNTIME option (#14686 )
2014-01-09 13:54:21 -05:00
Stephen Kelly
2f15a07727
Help: Link to CMAKE_POLICY_DEFAULT_CMP<NNNN> in policies manual.
2014-01-09 19:45:08 +01:00
Stephen Kelly
bb8bde35b8
Help: Add notes about relocatability of config-file packages.
2014-01-09 19:45:08 +01:00
Stephen Kelly
531e40b95e
cmTarget: Make GetSourceFiles populate an out-vector parameter.
...
In a future patch, this will also be populated with extra
sources from the linked dependencies.
2014-01-09 19:38:08 +01:00
Stephen Kelly
38de54cf6f
cmGeneratorTarget: Add methods to access source file groups.
...
These methods and others will be able to get a config parameter
later to implement the INTERFACE_SOURCES feature.
2014-01-09 19:38:07 +01:00
Joe Abbey
519084cd2e
FindJNI: Set JAVA_INCLUDE_PATH2 for darwin ( #14508 )
2014-01-09 09:59:56 -05:00
Brad King
a0eb52c10c
Merge topic 'compat-help-custom-modules'
...
b177294
cmake: Implement placeholder --help-custom-modules compatibility
2014-01-09 09:37:22 -05:00
Brad King
15562c11ef
Merge topic 'policies'
...
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.
2014-01-09 09:37:20 -05:00
Brad King
69c366a281
Merge topic 'optional-install'
...
be0458c
InstallRules: added new variable to disable generation of install rules
2014-01-09 09:37:17 -05:00
Brad King
f3a9eb4560
Merge topic 'vs10-include-backslashes'
...
c131107
VS: Convert include path to backslashes for VS >= 10
2014-01-09 09:37:15 -05:00
Brad King
df55a930fa
Merge topic 'qt4-find-root'
...
e8b8b37
FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already rooted.
2014-01-09 09:37:12 -05:00
Brad King
e5783a6f51
Merge topic 'multiarch-multios'
...
f293d52
GNUInstallDirs: Use multiarch on Debian with FreeBSD and HURD kernels
2014-01-09 09:37:09 -05:00
Kitware Robot
ef2bb1c6ed
CMake Nightly Date Stamp
2014-01-09 00:01:08 -05:00
Brad King
d729899a26
FindBoost: Add Boost_USE_DEBUG_RUNTIME option ( #14686 )
...
Add an option to control use of the 'g' runtime debug library tag
on MSVC tools. Default to ON to preserve existing behavior.
2014-01-08 11:32:17 -05:00
Brad King
b17729460b
cmake: Implement placeholder --help-custom-modules compatibility
...
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.
2014-01-08 11:16:48 -05:00
Stephen Kelly
73e93400e2
get_target_property: Error on non-existent target.
...
Introduce policy CMP0045 to control this behavior.
2014-01-08 16:41:34 +01:00
Stephen Kelly
ab9f58f657
FindQt4: Ensure target exists before calling get_target_property.
...
This macro is called for all potential Qt targets, even those which were
not found.
2014-01-08 16:41:34 +01:00
Stephen Kelly
37ebeb9100
FindQt4: Fix use of get_target_property to use actual target name.
...
This was introduced in ba48e63f
(Generate config-specific interface
link libraries propeties., 2013-02-09).
2014-01-08 16:41:34 +01:00
Stephen Kelly
6aabb6a62b
Genex: Use case-sensitive comparison for COMPILER_ID.
2014-01-08 16:41:34 +01:00
Stephen Kelly
5bb53f6b73
cmTarget: Deprecate COMPILE_DEFINITIONS_ properties with a policy.
2014-01-08 16:41:34 +01:00
Nils Gladitz
be0458c562
InstallRules: added new variable to disable generation of install rules
...
The boolean variable CMAKE_SKIP_INSTALL_RULES
allows disabling generation of install rules for projects which don't
want them.
2014-01-08 16:28:14 +01:00
Stephen Kelly
f579fe0d7a
Help: Fix link to MAP_IMPORTED_CONFIG_<CONFIG>
2014-01-08 16:06:41 +01:00
Stephen Kelly
590d238914
cmTarget: Handle NO_SYSTEM_FROM_IMPORTED.
...
This handling was lost in commit faedd2be
(cmTarget: Fix system include
annotation propagation., 2014-01-01).
2014-01-08 16:06:41 +01:00
Brad King
beb9cfae17
Merge topic 'cmp0022-docs'
...
28ffb7e
Note how to write CMP0022 compatible code with CMake 2.8.9.
2014-01-08 09:58:47 -05:00
Brad King
1857660984
Merge topic 'wix-cmake-package-registry'
...
92c4d40
CPackWiX: added new CPACK_WIX_CMAKE_PACKAGE_REGISTRY variable
2014-01-08 09:58:45 -05:00
Brad King
9551b85a90
Merge topic 'xcode-storyboard-file-type'
...
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
2014-01-08 09:58:43 -05:00
Brad King
afbac9f2d8
Merge topic 'minor-cleanups'
...
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.
2014-01-08 09:58:41 -05:00
Brad King
c1311077b8
VS: Convert include path to backslashes for VS >= 10
...
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
2014-01-08 08:58:20 -05:00
Clinton Stimpson
e8b8b37ef6
FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already rooted.
...
Thanks to Thomas Petazzoni for part of this fix.
2014-01-08 06:07:24 -07:00
Stephen Kelly
28ffb7e0be
Note how to write CMP0022 compatible code with CMake 2.8.9.
...
This has come up on the mailing list, and various other places.
2014-01-08 13:41:24 +01:00
Kitware Robot
3af2afafc0
CMake Nightly Date Stamp
2014-01-08 00:01:11 -05:00
Nils Gladitz
92c4d4039e
CPackWiX: added new CPACK_WIX_CMAKE_PACKAGE_REGISTRY variable
...
Allows automatic registration of installed packages with
the cmake package registry.
2014-01-08 01:28:24 +01:00
Brad King
e361c3cb18
Merge branch 'xcode-storyboard-file-type-2.8.12' into xcode-storyboard-file-type
...
Resolve conflict in Source/cmGlobalXCodeGenerator.cxx by keeping
our side.
2014-01-07 14:28:30 -05:00
Ruslan Baratov
93fc5a53a6
Xcode: Fix storyboard view
...
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'.
2014-01-07 14:10:55 -05:00