Brad King
050c02849e
Merge topic 'doc-Qt-macro-TARGET-arg'
...
4608a260
Document the TARGET options in Qt4 macros.
2014-01-15 10:12:00 -05:00
Rolf Eike Beer
b22a0f15de
bootstrap: improve ld flag for Linux/HPPA builds
...
Follow up commit ca63bb10
(bootstrap: try better workaround for builds
on Linux/HPPA, 2013-09-12) with an improved ld flag.
Suggested-by: Guy Martin
2014-01-15 10:06:07 -05:00
Kitware Robot
556b16db9c
CMake Nightly Date Stamp
2014-01-15 00:01:05 -05:00
Rolf Eike Beer
3a0d164bb2
allow to mark a test as "Not Run" with a specific return code ( #8466 )
2014-01-14 23:57:40 +01:00
Brad King
d5639044d3
Merge topic 'fix-cb-nmake-quotes'
...
f2b47197
CodeBlocks: fix unescaped command quotes when used with nmake
2014-01-14 08:56:05 -05:00
Brad King
6389da7905
Merge topic 'update-Qt4-COMPILE_DEFINITIONS'
...
2509c767
Qt4: Use generator expression in COMPILE_DEFINITIONS (#14692 )
2014-01-14 08:56:03 -05:00
Stephen Kelly
4608a260d4
Document the TARGET options in Qt4 macros.
...
Feature introduced in commit 9ce60ff5
(Qt4Macros: Allow specifying
a TARGET in invokations of macros., 2013-02-26).
2014-01-14 14:55:05 +01:00
Kitware Robot
31e1c39c57
CMake Nightly Date Stamp
2014-01-14 00:01:07 -05:00
Nils Gladitz
f2b47197dc
CodeBlocks: fix unescaped command quotes when used with nmake
2014-01-13 23:15:26 +01:00
Brad King
071005add1
Merge topic 'support-codelite-ide-generator'
...
0c4e8c70
Add support for codelite IDE project fles
2014-01-13 10:28:37 -05:00
Brad King
cb8c9dd01b
Merge topic 'missing-dependency-error'
...
0bf6f13b
AddDependencies: new policy requires dependencies to exist
2014-01-13 10:25:33 -05:00
Brad King
8d989d1788
Merge topic 'constify'
...
2cbf0311
cmGlobalGenerator: Make SelectMakeProgram const.
b4ff38a5
cmGlobalGenerator: Make CheckALLOW_DUPLICATE_CUSTOM_TARGETS const
8aeddf1f
cmGlobalGenerator: Make some API const.
8fd0f2a7
cmGeneratorTarget: Hold a const global generator.
46315320
cmComputeLinkDepends: Hold a const global generator.
2014-01-13 10:25:32 -05:00
Brad King
b003f56f85
Merge topic 'fix-find-package-mode'
...
a7f393dc
cmake: Future-proof --find-package mode.
2014-01-13 10:25:30 -05:00
Brad King
0eadf2058c
Merge topic 'fix-FindPackageModeMakefileTest-Makefile'
...
dea71aae
Tests: Fix find-package mode test.
2014-01-13 10:25:28 -05:00
Brad King
020006f936
Merge topic 'ninja_fix_rerun'
...
6fac24d7
Ninja: Avoid re-running CMake on next build after regeneration
2014-01-13 10:23:23 -05:00
Robert Maynard
6fac24d750
Ninja: Avoid re-running CMake on next build after regeneration
...
In commit 4a6397a7
(Ninja: Track configured files so we can regenerate
them, 2013-06-17) we accidentally started listing files generated by
CMake as inputs to the configuration process instead of outputs from it.
Move the list of files generated by CMake to the regeneration rule
outputs section and tell Ninja to restat after running it.
2014-01-13 10:09:48 -05:00
Stephen Kelly
a7f393dc49
cmake: Future-proof --find-package mode.
...
Create cmGeneratorTargets before generating generate-time information.
C++ interfaces for querying build information is increasingly only
available at generate time through the cmGeneratorTarget class. Ensure
that the required cmGeneratorTarget instances are created. Use the
cmGlobalGenerator access API to access the relevant cmGeneratorTarget
instead of creating a temporary one on the stack.
2014-01-13 16:09:15 +01:00
Stephen Kelly
2509c7678f
Qt4: Use generator expression in COMPILE_DEFINITIONS ( #14692 )
...
Commit 5bb53f6b
(cmTarget: Deprecate COMPILE_DEFINITIONS_ properties
with a policy., 2013-12-30) deprecated the config-specific
COMPILE_DEFINITIONS_* properties in favour of using generator
expressions.
Set the directory property in UseQt4.cmake to match the
INTERFACE_COMPILE_DEFINITIONS on the Qt4::QtCore and Qt5::Core
IMPORTED targets. Setting QT_NO_DEBUG is sufficient because qglobal.h
sets the corresponding QT_DEBUG definition if required.
2014-01-13 15:53:00 +01:00
Kitware Robot
9f6b633f37
CMake Nightly Date Stamp
2014-01-13 00:01:06 -05:00
Stephen Kelly
2cbf031190
cmGlobalGenerator: Make SelectMakeProgram const.
2014-01-12 20:18:11 +01:00
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
Nils Gladitz
0bf6f13b1d
AddDependencies: new policy requires dependencies to exist
...
Added new policy CMP0046 which requires dependencies added by
add_dependencies() to actually exist.
2014-01-12 12:58:04 +01:00
Kitware Robot
325ca1f253
CMake Nightly Date Stamp
2014-01-12 00:01:04 -05:00
Stephen Kelly
dea71aae6d
Tests: Fix find-package mode test.
...
The all target was depending on the clean and pngtest targets, but
when running the tests with -jN, those can be executed out of order.
Make the main.o target depend on the clean target instead to fix
this.
2014-01-11 13:58:23 +01: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
Eran Ifrah
0c4e8c70a0
Add support for codelite IDE project fles
2014-01-10 09:20:11 +02: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