kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
21,699 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

21699 Commits

Author SHA1 Message Date
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
Stephen Kelly f5ca872e8b Use linked frameworks as a source of include directories. 2013-07-24 11:49:06 -04:00
Stephen Kelly 650e61f833 Add a convenient way to add the includes install dir to the INTERFACE. 
Export the INCLUDES DESTINATION without appending to the
INTERFACE_INCLUDE_DIRECTORIES of the target itself. That way, a target
can be exported multiple times with different INCLUDES DESTINATION
without unintended cross-pollution of export sets.
 2013-07-24 17:32:58 +02:00
Brad King e31c4bd9a6 Merge topic 'dev/property-append-with-empty-string' 
31bd83e set_property: Do not remove a property when APPENDing nothing
 2013-07-24 11:02:44 -04:00
Brad King fdbf952684 Merge topic 'FindCuda_more_search_paths' 
09f00a6 FindCUDA: Search for libraries in <prefix>/lib/<arch>/nvidida-current.
 2013-07-24 11:02:37 -04:00
Brad King e6f93dc560 Merge topic 'windows_ninja_duplicate_paths' 
a11da72 Ninja: Properly convert all paths to unix style before we do set intersection.
 2013-07-24 11:02:33 -04:00
Brad King 49e8c65b92 Merge topic 'fix-FindQt4-available-modules' 
969e7ee FindQt4: Don't use Qt component _FOUND vars before they're defined (#14286)
 2013-07-24 11:02:29 -04:00
Brad King a52f00e07c Merge topic 'minor-cleanups' 
8f5b402 Remove TODO to uniq COMPILE_OPTIONS
5fb58b8 Don't add trailing whitespace to error message.
 2013-07-24 11:02:24 -04:00
Brad King 571d050415 Merge topic 'fix-mapped-config-genex' 
10a069b Genex: Fix $<CONFIG> with IMPORTED targets and multiple locations.
 2013-07-24 11:02:19 -04:00
Brad King 6077847edc Merge topic 'remove-LINK_LANGUAGE-genex' 
4f6bd70 Remove the LINK_LANGUAGE generator expression.
 2013-07-24 11:02:14 -04:00
Ben Boeckel 31bd83e9fc set_property: Do not remove a property when APPENDing nothing 2013-07-24 10:50:15 -04:00
Stephen Kelly 969e7ee5df FindQt4: Don't use Qt component _FOUND vars before they're defined (#14286) 
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).
 2013-07-24 10:46:00 -04:00