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

21489 Commits

Author SHA1 Message Date
Brad King 677384017a libarchive: Include cm_zlib.h to get zlib used by CMake 
Follow up change from commit ffa6faa4 (libarchive: Include cm_zlib.h to
get zlib used by CMake, 2011-12-20) for new includes of zlib.h in
updated libarchive.
 2013-07-31 08:19:58 -04:00
Brad King 8dc0a9f898 libarchive: Update README-CMake.txt for new snapshot 2013-07-31 08:19:48 -04:00
Brad King 102071f80c Merge branch 'libarchive-upstream' into update-libarchive 
Conflicts:
	Utilities/cmlibarchive/CMakeLists.txt
	Utilities/cmlibarchive/libarchive/archive.h
	Utilities/cmlibarchive/libarchive/archive_entry.h
	Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c
	Utilities/cmlibarchive/libarchive/archive_read_support_format_iso9660.c
	Utilities/cmlibarchive/libarchive/archive_windows.h
	Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
 2013-07-31 08:19:13 -04:00
LibArchive Upstream 35df7c8ba8 libarchive 3.1.2 (reduced) 
Extract upstream libarchive using the following shell code.

url=git://github.com/libarchive/libarchive.git &&
v=3.1.2 &&
r=19f23e19 &&
paths="
  CMakeLists.txt
  COPYING
  CTestConfig.cmake
  build/cmake
  build/pkgconfig
  build/utils
  build/version
  libarchive/*.*
" &&
mkdir libarchive-$v-g$r-reduced &&
git clone $url libarchive-git &&
date=$(cd libarchive-git && git log -n 1 --format='%cd' $r) &&
(cd libarchive-git && git archive --format=tar $r -- $paths) |
(cd libarchive-$v-g$r-reduced && tar xv) &&
fromdos libarchive-$v-g$r-reduced/build/cmake/Find*.cmake &&
echo "g$r date: $date"
 2013-07-26 15:45:29 -04: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
Kitware Robot 4c2803358d CMake Nightly Date Stamp 2013-07-26 00:01:07 -04: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
Stephen Kelly 10a069b504 Genex: Fix $<CONFIG> with IMPORTED targets and multiple locations. 
The old code checked only that there was a LOCATION for the
specified config, but did not check whether the config actually
mapped.

Task-number: 14292
 2013-07-24 10:43:02 -04:00
Stephen Kelly 4f6bd7022b Remove the LINK_LANGUAGE generator expression. 
It accepted an optional argument to test for equality, but no way
to get the linker language of a particular target.

TARGET_PROPERTY provides this flexibility and STREQUAL provides
the necessary API for equality test.

Extend the CompileDefinitions test to cover accessing the
property of another target.
 2013-07-24 10:40:00 -04:00
Sebastian Leske 41bb95fc67 Document CMAKE_<LANG>_FLAGS variable (#14305) 
We already document the variables CMAKE_<LANG>_FLAGS_{DEBUG, MINSIZEREL,
RELEASE, RELWITHDEBINFO}. However, CMAKE_<LANG>_FLAGS is not documented,
even though it's available (and useful).
 2013-07-24 10:30:34 -04:00
Kitware Robot 52daa0ea34 CMake Nightly Date Stamp 2013-07-24 00:01:04 -04:00
Kitware Robot ffe79b582f CMake Nightly Date Stamp 2013-07-23 00:01:09 -04:00
Robert Maynard a11da72e7b Ninja: Properly convert all paths to unix style before we do set intersection. 
On windows we had a subset of the paths as unix style and a subset as windows
so when doing the set intersection it resulted in the same file being
found twice.
 2013-07-22 10:42:37 -04:00
Brad King cb57ce249e Merge topic 'AddCommentsToExportsFile' 
4b1919f ExportTargets: add one more comment to the generated file.
 2013-07-22 09:48:51 -04:00
Brad King 8521a909ba Merge topic 'rpath-on-mac' 
603bc59 OS X: Fix regression handling frameworks for Ninja
e645ff0 OS X: Enable rpath support on Mac OS X when find_library() is used.
 2013-07-22 09:48:44 -04:00
Brad King fd8746d038 Merge topic 'SelectLibraryConfigurations' 
04d4dc3 SelectLibraryConfigurations: Use -NOTFOUND instead of copying the vars
07b44e7 SelectLibraryConfigurations: Do not cache the _LIBRARY variable
 2013-07-22 09:48:39 -04:00
Brad King 29859c09af Merge topic 'cpack-wix' 
bf23891 CPackWIX: Add support for custom WiX templates
155bb01 CMakeCPack: Provide an upgrade guid for WiX
bfa2e29 CPackWIX: Add option to specify the language(s) of the installer
6e51ea9 CPackWIX: Handle multiple shortcuts in the start menu
6d77e1a CPackWIX: Fix MSI package layout regression from parent
8c0e325 CPackWIX: Handle CPACK_PACKAGE_EXECUTABLES (#13967)
 2013-07-22 09:48:32 -04:00