Rolf Eike Beer
817db64c2c
fix compile error on AIX/gcc-2.9 because of unknown std::stringstream
2014-04-22 22:21:31 +02:00
Brad King
d3417a270f
Merge branch 'release'
2014-04-22 12:54:58 -04:00
Brad King
72ab764582
Merge branch 'osx-CFBundle-info-plist' into release
2014-04-22 12:53:51 -04:00
Brad King
08a5b6b3cb
Merge topic 'osx-CFBundle-info-plist'
...
e4e76f28
Merge branch 'master' into osx-CFBundle-info-plist
149ce5db
OS X: Fix Info.plist placement in a CFBundle
2014-04-22 12:53:16 -04:00
Brad King
e4e76f286c
Merge branch 'master' into osx-CFBundle-info-plist
...
Resolve conflict in Source/cmOSXBundleGenerator.cxx by taking
the side from 'master'.
2014-04-22 12:51:55 -04:00
Tim Blechmann
149ce5db5e
OS X: Fix Info.plist placement in a CFBundle
...
Fix cmOSXBundleGenerator::CreateCFBundle to place Info.plist under the
same root directory as the rest of the bundle. Without this, Info.plist
was placed into CMAKE_BINARY_DIR, not CMAKE_CURRENT_BINARY_DIR because
the target path was not generated correctly.
2014-04-22 12:48:44 -04:00
Kitware Robot
2475acc497
CMake Nightly Date Stamp
2014-04-22 00:01:08 -04:00
Brad King
b10083876c
Merge topic 'feature-absence-hard-error'
...
8d0b1cca
Features: FATAL_ERROR on compilers with no recorded features.
447fbb3f
Tests: Execute compile features tests unconditionally.
597bb72e
Tests: Run RunCMake.target_compile_features unconditionally.
2014-04-21 09:35:42 -04:00
Brad King
658cc11cf1
Merge topic 'fix-wix-cpack-crash'
...
cb59f5da
CPackWIX: Delay creation of cmWIXPatch until CPack has initialized Logger
2014-04-21 09:32:33 -04:00
Brad King
ba83d84714
Merge topic 'ExternalData-missing-not-fatal'
...
ccd29b9a
ExternalData: Warn on missing file instead of failing
2014-04-21 09:32:32 -04:00
Brad King
a0972532b3
Merge topic 'CMP0052-docs'
...
692228e4
Help: Link to cmake-buildsystem from CMP0052 docs.
e5e9b8e9
Help: Add code example for INSTALL_INTERFACE to cmake-buildsystem.
2014-04-21 09:32:30 -04:00
Brad King
bb891c2ef1
Merge topic 'internal-error-backtrace'
...
3de4c295
cmake: Print C++ stack trace after INTERNAL_ERROR messages
2014-04-21 09:32:28 -04:00
Brad King
464c8ab3a2
Merge topic 'autorcc-target-dir'
...
33774ca2
QtAutogen: Put generated qrc files in a target-specific dir.
2014-04-21 09:32:27 -04:00
Brad King
fd4ee2d86f
Merge topic 'FindGTK2_fix_bsd'
...
d5a6069a
FindGTK2: Add GTK2_(FONTCONFIG|X11)_INCLUDE_DIR optional includes
ef9366b0
FindGTK2: Add /usr/X11R6/ to include paths
2014-04-21 09:32:25 -04:00
Brad King
ad8041e335
Merge topic 'UseSWIG-guess_module_name'
...
2c96192f
UseSWIG: Revise and format documentation
e147c5c5
UseSWIG: Detect module name from interface file (#10080 )
2014-04-21 09:32:23 -04:00
Daniele E. Domenichelli
d5a6069a12
FindGTK2: Add GTK2_(FONTCONFIG|X11)_INCLUDE_DIR optional includes
2014-04-21 09:28:55 -04:00
Julien Schueller
2c96192f4c
UseSWIG: Revise and format documentation
...
Also add some documentation of SWIG_MODULE_NAME.
2014-04-21 09:23:41 -04:00
Julien Schueller
e147c5c555
UseSWIG: Detect module name from interface file ( #10080 )
...
If no SWIG_MODULE_NAME is specified explicitly and the .i file exists,
scan it for the module name declaration.
2014-04-21 09:22:57 -04:00
Kitware Robot
c770d404d2
CMake Nightly Date Stamp
2014-04-21 00:01:06 -04:00
Kitware Robot
bae9452200
CMake Nightly Date Stamp
2014-04-20 00:01:06 -04:00
Kitware Robot
1a4eb50946
CMake Nightly Date Stamp
2014-04-19 00:01:22 -04:00
Nils Gladitz
cb59f5da97
CPackWIX: Delay creation of cmWIXPatch until CPack has initialized Logger
...
Without the fix CPack will crash when the cmWIXPatch class tries to issue
any diagnostics.
2014-04-18 22:45:30 +02:00
Brad King
3970b5de0f
Merge branch 'release'
2014-04-18 13:17:29 -04:00
Stephen Kelly
33774ca201
QtAutogen: Put generated qrc files in a target-specific dir.
2014-04-18 16:41:13 +02:00
Brad King
046ee6d36d
Merge branch 'release'
2014-04-18 09:35:49 -04:00
Brad King
2b7f70cdcb
Merge branch 'sphinx-python3' into release
2014-04-18 09:10:13 -04:00
Brad King
e0790c90c0
Merge topic 'sphinx-python3'
...
69069cfb
Utilities/Sphinx: Port documentation generation to python3 (#14886 )
2014-04-18 09:08:28 -04:00
Uwe L. Korn
69069cfb1a
Utilities/Sphinx: Port documentation generation to python3 ( #14886 )
2014-04-18 08:42:34 -04:00
Kitware Robot
c9d13f841e
CMake Nightly Date Stamp
2014-04-18 00:01:15 -04:00
Brad King
3de4c29565
cmake: Print C++ stack trace after INTERNAL_ERROR messages
...
Since an INTERNAL_ERROR is always a bug, it will be useful to have the
program stack trace available in the report.
2014-04-17 11:25:19 -04:00
Stephen Kelly
8d0b1ccac1
Features: FATAL_ERROR on compilers with no recorded features.
...
Users of the new target_compile_features command are expected to
check the existence of the CMAKE_CXX_COMPILE_FEATURES variable before
attempting to use it to require features.
2014-04-17 16:20:50 +02:00
Stephen Kelly
447fbb3fac
Tests: Execute compile features tests unconditionally.
...
Conditionally create a dummy test if there are no known features.
2014-04-17 16:20:50 +02:00
Brad King
ccd29b9af8
ExternalData: Warn on missing file instead of failing
...
When the primary source tree path named by a DATA{} reference does not
exist, produce an AUTHOR_WARNING instead of a FATAL_ERROR. This is
useful when writing a new DATA{} reference to a test reference output
that has not been created yet. This way the developer can run the test,
manually verify the output, and then copy it into place to provide the
reference and eliminate the warning.
If the named source tree path is expected to be a file but exists as a
directory, we still need to produce a FATAL_ERROR.
2014-04-17 09:45:09 -04:00
Brad King
5265a5dc2a
Merge branch 'release'
2014-04-17 09:18:24 -04:00
Brad King
2fca2b2310
Merge topic 'fix-CMP0052'
...
3b673586
CMP0052: Make the warning message more informative.
5baa8159
CMP0052: Test that include dirs in install locations cause no warnings.
9e0b3153
CMP0052: Do not warn when include dir is not in source or build tree
2014-04-17 09:11:10 -04:00
Brad King
51a8a37443
Merge topic 'FindGTest-typed-test'
...
1f3e95ba
FindGTest: Teach GTEST_ADD_TESTS about TYPED_TEST
2014-04-17 09:11:08 -04:00
Brad King
fe27c993ff
Merge topic 'update-libarchive'
...
67f5f0a9
libarchive: Use _snprintf on Windows, not snprintf
fcfbb0a9
libarchive: Drop LIBARCHIVE_ADDITIONAL_LIBS, CMake does not need it
61a649d9
libarchive: Update README-CMake.txt for new snapshot
4533560c
Merge branch 'libarchive-upstream' into update-libarchive
44d6b82f
libarchive: Disable all whitespace checks in third-party code
37f225b7
libarchive 3.1.2-246-ga5a5d28b (reduced)
6ab7c326
libarchive: Avoid left-shift overflow of signed integer
2014-04-17 09:11:06 -04:00
Brad King
7a36a34a65
Merge topic 'update-prebuilt-openssl'
...
b84ee41a
Utilities/Release: Update to openssl-1.0.1g
2014-04-17 09:11:04 -04:00
Brad King
d9e2cd258c
Merge topic 'codelite-simplify'
...
c8e565a0
CodeLite generator: simplify code a bit
2014-04-17 09:11:03 -04:00
Brad King
4c966d90c7
Merge topic 'vs-use-full-paths'
...
0d048384
VS: Use full path to sources to allow deeper trees with VS >= 10
2014-04-17 09:11:01 -04:00
Brad King
41c76d5aeb
Merge topic 'ar-no-replace'
...
1ec6485c
Support duplicate object names in large archives (#14874 )
2014-04-17 09:10:59 -04:00
Brad King
c14010e4ea
Merge topic 'archive-null-error'
...
b508de59
cmArchiveWrite: Handle NULL error string (#14882 )
2014-04-17 09:10:56 -04:00
Brad King
ef10fc47ae
Merge topic 'implicit-libNN-dirs'
...
cc57ff5c
Drop /lib32 and /lib64 from link directories and RPATH (#14875 )
2014-04-17 09:10:53 -04:00
Stephen Kelly
3b673586f5
CMP0052: Make the warning message more informative.
...
Print the reason for the offending entry in the
INTERFACE_INCLUDE_DIRECTORIES.
2014-04-17 09:08:24 -04:00
Stephen Kelly
5baa81592b
CMP0052: Test that include dirs in install locations cause no warnings.
2014-04-17 09:07:59 -04:00
Stephen Kelly
692228e418
Help: Link to cmake-buildsystem from CMP0052 docs.
2014-04-17 11:05:20 +02:00
Stephen Kelly
e5e9b8e9a3
Help: Add code example for INSTALL_INTERFACE to cmake-buildsystem.
2014-04-17 11:01:58 +02:00
Kitware Robot
858ed4b390
CMake Nightly Date Stamp
2014-04-17 00:01:08 -04:00
Brad King
9e0b3153fa
CMP0052: Do not warn when include dir is not in source or build tree
...
When the policy was added by commit 783bce29
(Export: Disallow exported
interface includes in src/build tree, 2014-03-31) it accidentally left a
code path that would warn when the include dir is in the install tree
but *not* in the source or build tree. Fix that.
2014-04-16 15:57:35 -04:00
Jack Morrison
1f3e95ba72
FindGTest: Teach GTEST_ADD_TESTS about TYPED_TEST
2014-04-16 14:01:52 -04:00