Brad King
50c5eb508c
Merge topic 'ninja_bad_cmcldeps_paths'
...
9275554
Ninja: Update BuildDepends test to verify cmcldeps depfiles.
6fa9d0a
Ninja: Make cmcldeps depfile output more consistent with 'ninja -t msvc'
2013-07-29 09:54:48 -04:00
Brad King
3dace78c2c
Merge topic 'minor-cleanups'
...
b8dc7fa
Genex: Disallow LINKER_LANGUAGE only when used on a static library.
c8a10ba
cmTarget: Fix iface libraries and languages for static libraries.
f94bdb3
cmTarget: Remove duplicates when printing traces of tll signatures
ff3d5fa
Export: Fix typo of LINK_INTERFACE_LIBRARIES.
79a7a81
Docs: Document variables for default visibility values.
6f6391b
Docs: Generalize and de-duplicate VISIBILITY_PREFIX docs.
d8cb47f
Docs: Trim trailing whitespace in generated doc.
f10e648
Docs: Document existing target property debugging options.
4f4d69f
Qt4Macros: Simplify some variable population.
a413a40
Qt4Macros: Remove undefined varible use.
b60a29e
Qt4Macros: Remove unneeded generate CONDITION.
e454cba
Docs: Document file(GENERATE) CONDITION as optional.
2013-07-29 09:54:34 -04:00
Brad King
eaeadfe440
Merge topic 'FindGTK2Debug'
...
32cf738
FindGTK2: Remove GTK2_SKIP_MARK_AS_ADVANCED option
a874142
FindGTK2: Update local changelog
cd2d9c7
FindGTK2: Append _INCLUDE_DIR to var name in _GTK2_FIND_INCLUDE_DIR
732324f
FindGTK2: Append _LIBRARY to var name in _GTK2_FIND_LIBRARY
03bd3d1
FindGTK2: Use GTK_XXX_LIBRARY_DEBUG libraries in debug mode
2013-07-29 09:54:21 -04:00
Daniele E. Domenichelli
32cf738c98
FindGTK2: Remove GTK2_SKIP_MARK_AS_ADVANCED option
...
Variables are now automatically marked as advanced by
SelectLibraryConfigurations
2013-07-29 09:40:58 -04:00
Daniele E. Domenichelli
a874142987
FindGTK2: Update local changelog
2013-07-29 09:40:58 -04:00
Daniele E. Domenichelli
cd2d9c739c
FindGTK2: Append _INCLUDE_DIR to var name in _GTK2_FIND_INCLUDE_DIR
...
This is to keep _GTK2_FIND_INCLUDE_DIR and _GTK2_FIND_LIBRARY coherent
after previous commit
2013-07-29 09:40:58 -04:00
Daniele E. Domenichelli
732324f1c8
FindGTK2: Append _LIBRARY to var name in _GTK2_FIND_LIBRARY
...
This avoids to get the base name using a regexp, in order to use
SelectLibraryConfigurations
2013-07-29 09:40:57 -04:00
Daniele E. Domenichelli
03bd3d12c0
FindGTK2: Use GTK_XXX_LIBRARY_DEBUG libraries in debug mode
...
If the GTK_XXX_LIBRARY_DEBUG library is available, it is now used when
linking in debug mode XXX.
A new set of variables GTK_XXX_LIBRARY_RELEASE is added and the
original GTK_XXX_LIBRARY uses the optimized/debug syntax.
2013-07-29 09:40:57 -04:00
Kitware Robot
fc1708ac99
CMake Nightly Date Stamp
2013-07-29 00:01:03 -04:00
Kitware Robot
8d3b65346f
CMake Nightly Date Stamp
2013-07-28 00:01:04 -04:00
Kitware Robot
46558d290b
CMake Nightly Date Stamp
2013-07-27 00:01:11 -04:00
Stephen Kelly
b8dc7fad23
Genex: Disallow LINKER_LANGUAGE only when used on a static library.
...
For shared libraries and executables, the linker_language is
indepenedent of the linked libraries.
2013-07-26 16:58:25 +02:00
Robert Maynard
9275554496
Ninja: Update BuildDepends test to verify cmcldeps depfiles.
2013-07-26 10:12:03 -04:00
Reid Kleckner
6fa9d0ab40
Ninja: Make cmcldeps depfile output more consistent with 'ninja -t msvc'
...
Ninja relies on the generator to produce paths that match up with the
paths used in the build.ninja file, which are spelled with backslashes.
Therefore, cmcldeps should canonicalize depfile paths to use backslashes
and relativize paths to the build directory.
2013-07-26 10:12:03 -04:00
Stephen Kelly
c8a10ba9ad
cmTarget: Fix iface libraries and languages for static libraries.
2013-07-26 15:15:42 +02:00
Brad King
87402c995e
Merge topic 'tid-system-argument'
...
9b9a596
cmTarget: Fix property name typo in docs.
2013-07-26 09:01:22 -04:00
Brad King
dda6e93666
Merge topic 'install-interface-relative'
...
d777b8e
Genex: Allow relative paths in INSTALL_INTERFACE.
2013-07-26 09:01:19 -04:00
Brad King
c82b1cbe83
Merge topic 'install-interface-includes'
...
650e61f
Add a convenient way to add the includes install dir to the INTERFACE.
2013-07-26 09:01:06 -04:00
Brad King
003154f62c
Merge topic 'Qt4-INTERFACE_LINK_LIBRARIES'
...
0f267c0
FindQt4: Populate the INTERFACE_LINK_LIBRARIES of IMPORTED targets.
2013-07-26 09:00:56 -04:00
Brad King
30999f8da2
Merge topic 'doc-check-compiler-flag-override'
...
3e79d65
Check*CompilerFlag: Document use of CMAKE_REQUIRED_DEFINITIONS (#14309 )
2013-07-26 09:00:51 -04:00
Brad King
a883bc0a3b
Merge topic 'sha2-avoid-type-pun'
...
6a365d0
sha2: Avoid type-punned pointer dereference (#14314 )
2013-07-26 09:00:45 -04:00
Stephen Kelly
f94bdb3deb
cmTarget: Remove duplicates when printing traces of tll signatures
2013-07-26 14:05:25 +02:00
Stephen Kelly
ff3d5fae5d
Export: Fix typo of LINK_INTERFACE_LIBRARIES.
...
Refer correctly to the old property, not the new one.
2013-07-26 13:10:06 +02:00
Stephen Kelly
79a7a81327
Docs: Document variables for default visibility values.
2013-07-26 09:37:12 +02:00
Stephen Kelly
6f6391b771
Docs: Generalize and de-duplicate VISIBILITY_PREFIX docs.
2013-07-26 09:37:12 +02:00
Stephen Kelly
d8cb47f23c
Docs: Trim trailing whitespace in generated doc.
2013-07-26 09:37:12 +02:00
Stephen Kelly
f10e64804e
Docs: Document existing target property debugging options.
2013-07-26 09:37:12 +02:00
Stephen Kelly
4f4d69fcc2
Qt4Macros: Simplify some variable population.
2013-07-26 09:37:12 +02:00
Stephen Kelly
a413a40873
Qt4Macros: Remove undefined varible use.
...
This may have been added in anticipation of processing COMPILE_OPTIONS,
but as moc does not accept them, there is no need for it.
2013-07-26 09:37:12 +02:00
Stephen Kelly
b60a29eaa1
Qt4Macros: Remove unneeded generate CONDITION.
2013-07-26 09:24:22 +02:00
Kitware Robot
4c2803358d
CMake Nightly Date Stamp
2013-07-26 00:01:07 -04:00
Stephen Kelly
e454cba292
Docs: Document file(GENERATE) CONDITION as optional.
2013-07-26 00:21:50 +02:00
Brad King
6a365d0901
sha2: Avoid type-punned pointer dereference ( #14314 )
...
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.
2013-07-25 13:10:13 -04:00
Stephen Kelly
9b9a596004
cmTarget: Fix property name typo in docs.
2013-07-25 15:06:02 +02:00
Brad King
10e54cd6c9
Merge topic 'dev/export-target-without-language'
...
5837f19
export: Error when exporting a target without a language
2013-07-25 08:47:49 -04:00
Brad King
17fb435b21
Merge topic 'doc-RunCMake-strips-expected'
...
c80a4f9
Tests/RunCMake: Document stripping of expected output
2013-07-25 08:47:17 -04:00
Ben Boeckel
5837f19690
export: Error when exporting a target without a language
...
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.
2013-07-25 08:44:57 -04:00
Ben Boeckel
c80a4f92ce
Tests/RunCMake: Document stripping of expected output
...
Document that trailing newlines are stripped from the -stdout.txt
and -stderr.txt content before using as a regular expression.
2013-07-25 08:38:53 -04:00
Brad King
2f8dace125
Merge topic 'tll-new-signatures'
...
b655865
target_link_libraries: Add PUBLIC/PRIVATE/INTERFACE keyword signature
2013-07-25 08:37:16 -04:00
Brad King
9f8fcdd2d8
Merge topic 'compile-defs-debugging'
...
a43e5e0
Test COMPILE_DEFINITIONS target property get/set/get round-trip
2013-07-25 08:37:13 -04:00
Brad King
86f2d83de3
Merge topic 'fix-FindQt4-available-modules'
...
d57c1c1
FindQt4: Re-add QAxServer to the QT_MODULES.
2013-07-25 08:37:01 -04:00
Brad King
6b92e93b6d
Merge topic 'doc-CMAKE_lang_FLAGS'
...
41bb95f
Document CMAKE_<LANG>_FLAGS variable (#14305 )
2013-07-25 08:36:55 -04:00
Stephen Kelly
d777b8e716
Genex: Allow relative paths in INSTALL_INTERFACE.
...
These paths can be prepended with the ${_IMPORT_PREFIX} generated
in the export file.
Such relative paths were previously an error.
2013-07-25 14:31:22 +02:00
Brad King
3e79d656da
Check*CompilerFlag: Document use of CMAKE_REQUIRED_DEFINITIONS ( #14309 )
...
Explain how CMAKE_REQUIRED_DEFINITIONS is set before calling the
check_*_source_compiles macros.
2013-07-25 08:25:15 -04:00
Stephen Kelly
0f267c012b
FindQt4: Populate the INTERFACE_LINK_LIBRARIES of IMPORTED targets.
...
This makes the IMPORTED_LINK_INTERFACE_LIBRARIES_<CONFIG> properties
obsolete.
2013-07-25 13:55:42 +02:00
Kitware Robot
6b184d1607
CMake Nightly Date Stamp
2013-07-25 00:01:05 -04:00
Brad King
a43e5e0ad5
Test COMPILE_DEFINITIONS target property get/set/get round-trip
...
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.
2013-07-24 13:25:47 -04:00
Stephen Kelly
d57c1c1b9e
FindQt4: Re-add QAxServer to the QT_MODULES.
...
This was removed instead of moved in commit b8af46cb
(FindQt4: Don't
fail if certain Qt modules are unavailable.).
2013-07-24 17:59:13 +02:00
Stephen Kelly
b655865bbf
target_link_libraries: Add PUBLIC/PRIVATE/INTERFACE keyword signature
...
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.
2013-07-24 11:52:44 -04:00
Brad King
828ddb6813
Merge topic 'framework-interface-includes'
...
f5ca872
Use linked frameworks as a source of include directories.
2013-07-24 11:50:49 -04:00