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
Kitware Robot
8e475470be
CMake Nightly Date Stamp
2013-07-31 00:01:05 -04:00
Kitware Robot
9181a4e3b6
CMake Nightly Date Stamp
2013-07-30 00:01:10 -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
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
Stephen Kelly
f868e47236
Fix crash on export of target with empty INTERFACE_INCLUDE_DIRECTORIES.
...
The new feature of install(TARGETS ... INCLUDES DESTINATION) introduced
in commit 650e61f8
(Add a convenient way to add the includes install
dir to the INTERFACE., 2013-01-05) introduced this crash. If the
new feature is used with a target which has no
INTERFACE_INCLUDE_DIRECTORIES, a segfault occurred.
2013-07-29 15:50:24 +02: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
Patrick Gansterer
2b473d2eaa
Add option to use stdout/stderr of original terminal in cmake --build
...
Pass the original file handles to the native tool when using the
--use-stderr option in the build command. This enables the
usage of advanced terminal features like colored output.
2013-07-29 08:52:54 +02: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
Rolf Eike Beer
2a7975398f
FindPNG: improve library detection ( #14301 )
...
-add support for upcoming version 1.7
-improve version selection, use the major and minor of the requested version
to generate the library suffix list
-support detection of release and debug libraries
2013-07-27 22:35:11 +02:00
Rolf Eike Beer
c0756b6dd6
Revert "CTest: fix pre and post test commands with spaces" ( #13887 )
...
This reverts commit 6187876dea
.
It was actually possible before to have paths with spaces in them, the spaces
just need to be quoted. This way spaces will work as argument separators.
2013-07-27 22:05:47 +02:00
Alex Neundorf
e32ff9666c
add macros cmake_print_properties() and cmake_print_variables()
...
This patch adds the file CMakePrintHelpers.cmake, which provides
the macros (functions) cmake_print_properties() and cmake_print_variables(),
which are useful e.g. for debugging and make inspecting target (or other)
properties easier.
Alex
2013-07-27 21:37:05 +02:00
Clinton Stimpson
84698abb51
OS X: If necessary, use xcrun to help find otool used to query install names.
...
This fixes querying for @rpath install names when using Xcode without
the command line tools installed.
2013-07-26 22:38:57 -06:00
Kitware Robot
46558d290b
CMake Nightly Date Stamp
2013-07-27 00:01:11 -04:00
Alex Neundorf
692ecf4b7c
graphvizoptions: add copyright notice
...
Alex
2013-07-26 23:32:41 +02:00
Alex Neundorf
ee32673c7d
Add documentation for the --graphviz support
...
This patch adds Modules/CMakeGraphVizOptions.cmake, which is used
only for generating documentation for the --graphviz support.
Alex
2013-07-26 22:43:42 +02: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