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
Brad King
567e4e681c
CMake 3.0.0-rc4
2014-04-16 13:24:46 -04:00
Brad King
1ec6485c6a
Support duplicate object names in large archives ( #14874 )
...
Generalize the change from commit 39d0ade0
(Windows-GNU: Support
duplicate object names in large archives, 2014-04-14) to the default
archive rules. These rules have used an incremental append approach
since commit v2.8.0~1856 (Build large archives incrementally,
2008-08-04). Switch from "ar r" to "ar q" to be sure we always append
objects instead of replacing them.
2014-04-16 13:19:43 -04:00
Brad King
e40fbbb074
Merge branch 'archive-null-error' into release
2014-04-16 13:19:10 -04:00
Brad King
ac00baa6a8
Merge branch 'implicit-libNN-dirs' into release
2014-04-16 13:19:03 -04:00
Brad King
b508de59e8
cmArchiveWrite: Handle NULL error string ( #14882 )
...
If archive_error_string returns NULL, use a placeholder string instead
of crashing.
2014-04-16 13:13:28 -04:00
Brad King
cc57ff5c49
Drop /lib32 and /lib64 from link directories and RPATH ( #14875 )
...
Extend CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES with these paths. We
already have the equivalents under /usr. Systems that have these
directories have their dynamic loaders configured already. Do not allow
them to appear in the RPATH explicitly.
2014-04-16 11:40:48 -04:00
Stephen Kelly
597bb72ed7
Tests: Run RunCMake.target_compile_features unconditionally.
...
It is so far testing only cases which are fatal regardless of
recorded features.
2014-04-16 17:22:19 +02:00
Stephen Kelly
a36b957fc4
Features: Add cxx_template_template_parameters.
...
Extend the existing feature infrastructure as needed to support
both C++11 and C++98 features.
2014-04-16 15:16:23 +02:00
Kitware Robot
fd8bb34278
CMake Nightly Date Stamp
2014-04-16 00:01:07 -04:00
Brad King
67f5f0a9fd
libarchive: Use _snprintf on Windows, not snprintf
2014-04-15 16:52:18 -04:00
Brad King
fcfbb0a924
libarchive: Drop LIBARCHIVE_ADDITIONAL_LIBS, CMake does not need it
2014-04-15 16:37:52 -04:00
Brad King
61a649d974
libarchive: Update README-CMake.txt for new snapshot
2014-04-15 16:36:44 -04:00
Brad King
4533560c23
Merge branch 'libarchive-upstream' into update-libarchive
...
Resolve conflicts in Utilities/cmlibarchive/CMakeLists.txt as
appropriate.
2014-04-15 16:34:50 -04:00
Brad King
44d6b82f43
libarchive: Disable all whitespace checks in third-party code
2014-04-15 16:34:17 -04:00
LibArchive Upstream
37f225b72c
libarchive 3.1.2-246-ga5a5d28b (reduced)
...
Extract upstream libarchive using the following shell code.
url=git://github.com/libarchive/libarchive.git &&
v=3.1.2-246-ga5a5d28b &&
r=a5a5d28b &&
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"
2014-04-15 16:31:20 -04:00
Brad King
b84ee41abb
Utilities/Release: Update to openssl-1.0.1g
...
Update the prebuilt binary build configurations for machines where
we build our own OpenSSL library to use a newer version.
2014-04-15 15:51:21 -04:00
Rolf Eike Beer
c8e565a06e
CodeLite generator: simplify code a bit
2014-04-15 20:13:42 +02:00
Brad King
0d04838469
VS: Use full path to sources to allow deeper trees with VS >= 10
...
As explained in cmVisualStudio10TargetGenerator::WriteSource comments,
VS tools append relative paths to the current directory, e.g.
c:\path\to\current\dir\..\..\..\relative\path\to\source.c
and fail if this is over 250 charaters or so. Previously we used a full
path only if no relative path could be constructed with a leading "../"
sequence that does not escape the source or build tree. This means that
long relative paths can be generated when the build tree is inside the
source tree, and can cause build failures due to the above path
concatenation problem.
Teach cmVisualStudio10TargetGenerator::ConvertPath to ask the Convert
method to honor CMAKE_USE_RELATIVE_PATHS. This will cause it to use
full paths by default but still give users the option of getting the
relative paths when possible.
Suggested-by: Josh Green <inbilla@gmail.com>
2014-04-15 11:52:48 -04:00
Brad King
8472ef243f
Merge topic 'cxx11-features'
...
60c0d2dd
Features: Add cxx_defaulted_move_initializers.
c4e67235
Features: Add cxx_long_long_type.
dcaafada
Features: Add cxx_func_identifier.
251a1f02
Features: Add cxx_local_type_template_args.
53fe7773
Features: Add cxx_extended_friend_declarations.
16603f7c
Features: Add cxx_enum_forward_declarations.
adf22f61
Features: Add cxx_default_function_template_args.
7b3e8a05
Features: Add cxx_right_angle_brackets.
9a49fd21
Features: Add cxx_decltype_incomplete_return_types.
1889045c
Features: Add cxx_sizeof_member.
ab455eba
Features: Add cxx_thread_local.
300ce248
Features: Add cxx_inline_namespaces.
f9d04a96
Features: Add cxx_variadic_macros.
3d76656f
Features: Add cxx_uniform_initialization.
e74b216c
Features: Add cxx_generalized_initializers.
ff80c3b4
Features: Add cxx_attributes.
...
2014-04-15 10:32:13 -04:00
Brad King
b56a9ae7f1
Merge topic 'target_compile_features'
...
9eaf3755
Export: Populate INTERFACE_COMPILE_FEATURES property.
8ed59fc2
Add target_compile_features command.
4e6ca504
cmTargetPropCommandBase: Change the interface to return bool.
5412dede
cmTarget: Transitively evaluate compiler features.
baff4434
cmTarget: Allow populating COMPILE_FEATURES using generator expressions.
f97bf437
Features: Add cxx_auto_type.
03355d6b
cmTarget: Add COMPILE_FEATURES target property.
faeddf64
project: Add infrastructure for recording CXX compiler features
913394af
cmTarget: Add CXX_STANDARD and CXX_EXTENSION target properties.
8238a6cd
Add some COMPILE_OPTIONS for specifying C++ dialect.
892243fc
Tests: Require CMake 3.0 for the SystemInformation test.
59b5fdd3
Don't load Clang-CXX from AppleClang-CXX.
2014-04-15 10:32:11 -04:00
Daniele E. Domenichelli
ef9366b0bb
FindGTK2: Add /usr/X11R6/ to include paths
...
Should fix builds on OpenBSD, see
http://open.cdash.org/viewTest.php?onlyfailed&buildid=3286713
2014-04-15 16:26:13 +02:00
Brad King
593b69c9dc
Merge topic 'aix-no-sstream'
...
941a1404
AIX: fix compilation error because of missing <sstream>
2014-04-15 10:22:41 -04:00
Brad King
33358fd571
Merge topic 'CMP0051-typo'
...
454b4bd2
Help: Fix typo in CMP0051.
2014-04-15 10:22:40 -04:00
Brad King
fc65bbdb70
Merge topic 'openbsd-sign-warning'
...
3022f2a1
cmELF: fix signedness warning on OpenBSD
2014-04-15 10:22:38 -04:00
Brad King
028aee1a07
Merge topic 'mingw-archive-no-replace'
...
39d0ade0
Windows-GNU: Support duplicate object names in large archives (#14874 )
2014-04-15 10:22:36 -04:00
Brad King
18aaed77c0
Merge topic 'matches-cleanup'
...
f21ac16e
Replace MATCHES test on numbers with EQUAL test
7eacbaed
Replace MATCHES ".+" tests with NOT STREQUAL ""
3a71d34c
Use CMAKE_SYSTEM_NAME instead of CMAKE_SYSTEM where sufficient
b0b4b460
Remove .* expressions from beginning and end of MATCHES regexs
5bd48ac5
Replace string(REGEX REPLACE) with string(REPLACE) where possible
2622bc3f
Clean up usage of if(... MATCHES regex) followed string(REGEX REPLACE regex)
2014-04-15 10:22:34 -04:00
Brad King
60d1882a67
Merge topic 'ninja-link-with-compile-flags'
...
97f2b7f5
Ninja: set correct LANGUAGE_COMPILE_FLAGS when linking
49fcffc6
Ninja: cmake formatting, make code more readable
b735c8cb
MinGW: link like on Unix and use compile flags when linking
2014-04-15 10:22:32 -04:00
Brad King
e13ff189d1
Merge topic 'libarchive-no-acl'
...
d9b59179
libarchive: Skip finding libacl.h when ENABLE_ACL is OFF (#14866 )
2014-04-15 10:22:30 -04:00
Brad King
4966c62f31
Merge topic 'CMakeDetermineVSServicePack-warn-deprecated'
...
73721c7c
CMakeDetermineVSServicePack: Add deprecation diagnostic
2014-04-15 10:22:28 -04:00
Brad King
1ce673a88b
Merge topic 'fix-qthelp-installation'
...
6578508c
Help: Fix installation of the Qt qch file.
2014-04-15 10:22:26 -04:00
Brad King
cb101b95f9
Merge topic 'ninja-win-link-path'
...
504bb62d
Ninja: replace \ in LINK_PATH for MinGW
2014-04-15 10:22:24 -04:00
Brad King
851a202d33
Merge topic 'fix-SourceFiles-configure-time'
...
b8af2011
cmTarget: Fix listing of source files at configure-time.
2014-04-15 10:22:22 -04:00
Brad King
18e480a5e9
Merge topic 'openbsd-warnings'
...
f9f91fa8
CTestCustom: Suppress warnings about rand() and srand() on OpenBSD
2014-04-15 10:22:20 -04:00
Brad King
27c141131e
Merge topic 'hpux-acc-ansi98'
...
185b4efe
CompileFlags: add better selection which aCC version gets -AA +hpxstd98 flags
2014-04-15 10:22:18 -04:00
Brad King
eda0dd6ffb
Merge topic 'suppress-sha2-cast-align-warnings'
...
a553dc0a
CTestCustom: Suppress -Wcast-align warnings in sha2 code
2014-04-15 10:22:17 -04:00
Brad King
353367091f
Merge topic 'FindMPI-lang-implicit-dirs'
...
856bfe23
FindMPI: Use compiler implicit link dirs for matching language (#14870 )
2014-04-15 10:22:15 -04:00
Peter Kümmel
97f2b7f5ab
Ninja: set correct LANGUAGE_COMPILE_FLAGS when linking
2014-04-15 10:17:06 -04:00