kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
24,089 Commits 1 Branch 14 Tags
Commit Graph

24089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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