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

21568 Commits

Author SHA1 Message Date
Brad King 95f78e08fe OS X: Search for SDK based on deployment target (#14324) 
When available, use CMAKE_OSX_DEPLOYMENT_TARGET instead of the host OS X
version to select the default SDK.  This makes sense because one should
use the SDK matching the deployment target.

Suggested-by: John Ralls <jralls@ceridwen.us>
 2013-08-02 14:05:00 -04:00
Brad King b341bf2178 Merge topic 'INCLUDES-DESTINATION-no-config' 
80e652f Export: Process generator expressions from INCLUDES DESTINATION.
4355815 cmTarget: Add NAME property
 2013-08-01 08:54:15 -04:00
Brad King 1a88bbf3f0 Merge topic 'FindGTK2-gmodule' 
7ca5958 FindGTK2: Detect gmodule library
76c72b9 FindGTK2: gthread-2.0 folder does not exist
 2013-08-01 08:53:58 -04:00
Brad King 0920587b1d Merge topic 'minor-cleanups' 
7429941 Docs: Fix typo in CMAKE_DEBUG_TARGET_PROPERTIES
 2013-08-01 08:53:45 -04:00
Brad King 75af0cbfe7 Merge topic 'vs-subsystem-order' 
b64e8f2 VS10: Honor user-specified /SUBSYSTEM: flag (#14326)
 2013-08-01 08:53:21 -04:00
Brad King a26e7d0782 Merge topic 'target-command-allow-no-items' 
c0b8682 Allow target commands to be invoked with no items (#14325).
 2013-08-01 08:52:35 -04:00
Kitware Robot f0f7ee0adf CMake Nightly Date Stamp 2013-08-01 00:01:09 -04:00
Stephen Kelly 80e652f5cc Export: Process generator expressions from INCLUDES DESTINATION. 
Configuration sensitive expressions are not permitted.
 2013-08-01 00:37:25 +02:00
Stephen Kelly 43558156d4 cmTarget: Add NAME property 
In generator expression contexts, this can be used to determine the
name of the head target in the evaluation.
 2013-08-01 00:36:11 +02:00
Daniele E. Domenichelli 7ca5958820 FindGTK2: Detect gmodule library 2013-07-31 17:40:07 +02:00
Daniele E. Domenichelli 76c72b9f14 FindGTK2: gthread-2.0 folder does not exist 
Partially revert commit 508e8ca024
 2013-07-31 17:39:38 +02:00
Stephen Kelly 7429941254 Docs: Fix typo in CMAKE_DEBUG_TARGET_PROPERTIES 
Introduced in commit f10e6480 (Docs: Document existing target
property debugging options., 2013-07-26)
 2013-07-31 17:13:46 +02:00
Brad King b64e8f22a4 VS10: Honor user-specified /SUBSYSTEM: flag (#14326) 
Use the WIN32_EXECUTABLE target property only to set the SubSystem build
attribute default.  When user-specified flags are later parsed they may
then override it.
 2013-07-31 10:17:17 -04:00
Stephen Kelly c0b8682200 Allow target commands to be invoked with no items (#14325). 
Code such as

 target_include_directories(foo PRIVATE ${items})

should not work or break based on whether items is defined or not.
 2013-07-31 16:06:34 +02:00
Brad King 0cecc7b485 Merge topic 'update-libarchive' 
26fe7e3 libarchive: Backport to CMake 2.8.2
b81a4e1 libarchive: Remove build options not used by CMake
3218f52 libarchive: Avoid struct init with variable
bae3a73 libarchive: Silence API deprecation warnings
6773840 libarchive: Include cm_zlib.h to get zlib used by CMake
8dc0a9f libarchive: Update README-CMake.txt for new snapshot
102071f Merge branch 'libarchive-upstream' into update-libarchive
35df7c8 libarchive 3.1.2 (reduced)
 2013-07-31 08:49:09 -04:00
Brad King e3b6ab92db Merge topic 'static_library_flags' 
33e6e0b VS6: Add handling of CMAKE_*_LINKER_FLAGS_<CONFIG> variables
152dfda Add additonal tests for the linker flags
20ed496 Add documentation for the missing CMAKE_*_LINKER_FLAGS_* variables
54f7019 Add CMAKE_STATIC_LINKER_FLAGS to CMakeCommonLanguageInclude
2a43c30 Add support for CMAKE_STATIC_LINKER_FLAGS
14bbf83 Unify the way the flags of a static library are read
 2013-07-31 08:49:01 -04:00
Brad King 58c5dc37d3 Merge topic '13582_configured_file_regeneration' 
8fbf39a cmMakefile: Do not track configured files known to be temporary
 2013-07-31 08:48:57 -04:00
Brad King 4e3675ae91 Merge topic 'ninja_bad_cmcldeps_paths' 
d12459f VS 6: Tell BuildDepends test to tolerate ninjadep failure
 2013-07-31 08:48:52 -04:00
Brad King f2db78c120 Merge topic 'bash-completion-updates' 
f85f6a5 bash-completion: Fix/improve generator names extraction
351fd63 bash-completion: Add -S,-SP options arguments completion
 2013-07-31 08:48:40 -04:00
Brad King b728ec3c31 Merge topic 'install-interface-includes' 
72d13ff install: Remove error condition using INCLUDES DESTINATION without EXPORT.
 2013-07-31 08:48:36 -04:00
Brad King cdfeda60f6 Merge topic 'add-cmake_reset_check_state' 
9349d69 Add cmake_reset_check_state() macro
 2013-07-31 08:48:29 -04:00
Brad King 6e2da4a4d3 Merge topic 'passthru' 
2b473d2 Add option to use stdout/stderr of original terminal in cmake --build
 2013-07-31 08:48:19 -04:00
Vadim Zhukov 9349d69abf Add cmake_reset_check_state() macro 
It's acknowledged that check state should not generally nest,
so it should be cleared when used, for example, in Find* module.

Also, add optional RESET argument to cmake_push_check_state().
 2013-07-31 08:43:22 -04:00
Patrick Gansterer 33e6e0b9c2 VS6: Add handling of CMAKE_*_LINKER_FLAGS_<CONFIG> variables 
Read the content of the config specific linker flags in the
Visual Studio 6 generator too.
 2013-07-31 08:41:08 -04:00
Patrick Gansterer 152dfdab11 Add additonal tests for the linker flags 
Extend Tests/LinkFlags to test libraries of the type MODULE and
the content of the CMAKE_*_LINKER_FLAGS_* variables.
 2013-07-31 08:41:08 -04:00
Patrick Gansterer 20ed496b6d Add documentation for the missing CMAKE_*_LINKER_FLAGS_* variables 
Add CMAKE_MODULE_LINKER_FLAGS_*, CMAKE_SHARED_LINKER_FLAGS_* and
CMAKE_STATIC_LINKER_FLAGS_* to cmDocumentVariables.cxx with a
similar documentation as CMAKE_EXE_LINKER_FLAGS_*.
 2013-07-31 08:41:07 -04:00
Patrick Gansterer 54f7019fd0 Add CMAKE_STATIC_LINKER_FLAGS to CMakeCommonLanguageInclude 
Add support for CMAKE_STATIC_LINKER_FLAGS_* to
CMakeCommonLanguageInclude.cmake to set the defaults similar
to the other CMAKE_*_LINKER_FLAGS_*.
 2013-07-31 08:41:07 -04:00
Patrick Gansterer 2a43c306fe Add support for CMAKE_STATIC_LINKER_FLAGS 
Add the content of this variable to the target specific linker flags
as we do with the other CMAKE_*_LINKER_FLAGS variables already.
 2013-07-31 08:41:07 -04:00
Patrick Gansterer 14bbf8340a Unify the way the flags of a static library are read 
Introduce cmLocalGenerator::GetStaticLibraryFlags() to have a central
function for getting the linker flags for a given target.
 2013-07-31 08:41:07 -04:00
Brad King 26fe7e3adf libarchive: Backport to CMake 2.8.2 
Avoid requiring CMake 2.8.6 for CMakePushCheckState or CMake 2.8.8 for
CMakeExpandImportedTargets.  Drop the custom versions of CMake modules
CheckCSource(Compiles|Runs) because we do not use the SAFESEH option
anyway.
 2013-07-31 08:22:15 -04:00
Brad King b81a4e1568 libarchive: Remove build options not used by CMake 
Drop options POSIX_REGEX_LIB and ENABLE_SAFESEH that we do not want for
the CMake build of libarchive.
 2013-07-31 08:21:20 -04:00
Brad King 3218f52f11 libarchive: Avoid struct init with variable 
Compilers such as Borland and MIPSpro do not like struct initialization
with variables.  Initialize using assignment instead.
 2013-07-31 08:20:24 -04:00
Brad King bae3a73cee libarchive: Silence API deprecation warnings 
CMake uses old libarchive APIs for now.
 2013-07-31 08:20:05 -04:00
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
Kitware Robot 8e475470be CMake Nightly Date Stamp 2013-07-31 00:01:05 -04:00
Brad King 8fbf39a471 cmMakefile: Do not track configured files known to be temporary 
Since commit ad502502 (cmMakefile: Track configured files so we can
regenerate them, 2013-06-18) cmMakefile::ConfigureFile records the
configured file as an output file generated by CMake.  The intention is
that for make and ninja we can re-run CMake when one of the files it
generates goes missing.  However, files configured temporarily in
CMakeTmp directories by Check* modules do not live past the CMake
invocation.

Teach cmMakefile::ConfigureFile to skip tracking files with "CMakeTmp"
in their path, just like cmCoreTryCompile::TryCompileCode does to
avoid adding dependencies on temporary source files.  In the future
we will need a more general filter to avoid recording as CMake
outputs any files that do not exist at the end of generation.
 2013-07-30 14:43:59 -04:00
Brad King d12459f79e VS 6: Tell BuildDepends test to tolerate ninjadep failure 
The VS 6 IDE does not want to recompile a particular source after
a particular header it includes is modified, even by hand.  For
now just silence the failure and document it with a comment.
 2013-07-30 09:41:46 -04:00
Kitware Robot 9181a4e3b6 CMake Nightly Date Stamp 2013-07-30 00:01:10 -04:00
Igor Murzov f85f6a5e79 bash-completion: Fix/improve generator names extraction 2013-07-30 03:13:08 +04:00
Igor Murzov 351fd63ef5 bash-completion: Add -S,-SP options arguments completion 2013-07-30 02:32:17 +04:00
Brad King c18117a129 Merge topic 'fix-export-includes-crash' 
f868e47 Fix crash on export of target with empty INTERFACE_INCLUDE_DIRECTORIES.
 2013-07-29 09:59:29 -04:00
Brad King 7c3494e9ae Merge topic 'PrintHelperFunctions' 
e32ff96 add macros cmake_print_properties() and cmake_print_variables()
 2013-07-29 09:55:31 -04:00
Brad King 63728df6e5 Merge topic 'memcheck_pre_post_args' 
c0756b6 Revert "CTest: fix pre and post test commands with spaces" (#13887)
 2013-07-29 09:55:27 -04:00
Brad King 1b9aa69498 Merge topic 'FindPNG-dbg-rel' 
2a79753 FindPNG: improve library detection (#14301)
 2013-07-29 09:55:18 -04:00
Brad King 3c683d788d Merge topic 'rpath-on-mac' 
84698ab OS X: If necessary, use xcrun to help find otool used to query install names.
 2013-07-29 09:55:15 -04:00
Brad King 64bb8f4d19 Merge topic 'DocumentGraphvisOptions' 
692ecf4 graphvizoptions: add copyright notice
ee32673 Add documentation for the --graphviz support
 2013-07-29 09:55:08 -04:00
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