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

32105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
06af626ef2 Merge topic 'cpack-ifw-list-variable' 
9e505285 CPackIFW: Using cpack_append_list_variable_set_command
cd1415b5 CPackComponents: add cpack_append_list_variable_set_command
 2016-07-06 09:35:06 -04:00
Kitware Robot
7d3fe197f8 CMake Nightly Date Stamp 2016-07-06 00:01:03 -04:00
Brad King
8d330277d6 Merge topic 'cmake-gui-static-xcb' 
5de1d406 Source/QtDialog: Run clang-format
 2016-07-05 15:16:29 -04:00
Brad King
5de1d406f1 Source/QtDialog: Run clang-format 2016-07-05 15:15:57 -04:00
Brad King
909048e534 Merge topic 'strip-flag-whitespace' 
3643390d Strip CMAKE_<LANG>_FLAGS[_<CONFIG>] initializer whitespace
 2016-07-05 11:29:17 -04:00
Brad King
d169b13975 Merge topic 'update-osx-release' 
e1e54295 Utilities/Release: Compile OS X binary as C++11
 2016-07-05 11:29:14 -04:00
Brad King
f8751753e3 Merge topic 'update-kwsys' 
aec1d43f Merge branch 'upstream-KWSys' into update-kwsys
f7d23e67 KWSys 2016-06-30 (96f06c8e)
 2016-07-05 11:29:11 -04:00
Kitware Robot
b9eb3408b4 CMake Nightly Date Stamp 2016-07-05 00:01:03 -04:00
Kitware Robot
7523267ca0 CMake Nightly Date Stamp 2016-07-04 00:01:03 -04:00
Kitware Robot
a24cd6525a CMake Nightly Date Stamp 2016-07-03 00:01:02 -04:00
Kitware Robot
b02814ed74 CMake Nightly Date Stamp 2016-07-02 00:01:08 -04:00
Brad King
3643390d49 Strip CMAKE_<LANG>_FLAGS[_<CONFIG>] initializer whitespace 2016-07-01 14:01:41 -04:00
Brad King
e1e54295e8 Utilities/Release: Compile OS X binary as C++11 
We already compile with `-stdlib=libc++` as required for Qt 5.6.
We can compile as C++11 and still deploy to OS X 10.7.
 2016-07-01 11:17:09 -04:00
Brad King
aec1d43f5d Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-06-30 (96f06c8e)
 2016-07-01 09:13:38 -04:00
KWSys Upstream
f7d23e6753 KWSys 2016-06-30 (96f06c8e) 
Code extracted from:

    http://public.kitware.com/KWSys.git

at commit 96f06c8e93d2b5e0395c9f413d1649563a2015d8 (master).

Upstream Shortlog
-----------------

Brad King (1):
      96f06c8e Drop the auto_ptr.hxx component of KWSys
 2016-07-01 09:13:38 -04:00
Brad King
4c476cc9b2 Merge topic 'clang-format-script' 
a77d597b clang-format.bash: Fix filter-branch example documentation
 2016-07-01 09:12:43 -04:00
Brad King
6e55605db1 Merge topic 'cmake-gui-static-xcb' 
73a3c0cd cmake-gui: Add build option to use Qt5 xcb plugin statically
 2016-07-01 09:12:40 -04:00
Brad King
cff9c11de7 Merge topic 'doc-updates' 
c05d240e Help: Document CMAKE_TRY_COMPILE_PLATFORM_VARIABLES example
dab3ccf2 InstallRequiredSystemLibraries: Document UCRT option use case
 2016-07-01 09:12:36 -04:00
Kitware Robot
f408a5b1b9 CMake Nightly Date Stamp 2016-07-01 00:01:05 -04:00
Brad King
a77d597b86 clang-format.bash: Fix filter-branch example documentation 
Inside `git filter-branch --tree-filter` we must format all tracked
files because formatting of the tree for each commit is independent
from earlier commits.
 2016-06-30 16:11:36 -04:00
Brad King
73a3c0cd98 cmake-gui: Add build option to use Qt5 xcb plugin statically 
This will enable builds against a static Qt5.
 2016-06-30 11:26:53 -04:00
Brad King
b1883bc8b7 Merge topic 'try_compile-config-flags' 
d582c23a try_compile: Add policy CMP0066 to honor CMAKE_<LANG>_FLAGS_<CONFIG>
 2016-06-30 09:47:41 -04:00
Brad King
2bef377427 Merge topic 'refactor-auto_ptr' 
b5ec5b09 Avoid using KWSys auto_ptr by adopting it ourselves
 2016-06-30 09:47:38 -04:00
Brad King
21afc0291e Merge topic 'update-liblzma' 
60212979 Merge branch 'upstream-liblzma' into update-liblzma
e4d39146 liblzma 2014-12-21 (265e5ffb)
d4f52404 liblzma: Revise update script to get version 5.0.8
bf969198 Merge branch 'upstream-liblzma' into update-liblzma
ca4276e4 liblzma: Remove CMake-specific README
d38a37ea liblzma 2013-06-30 (b69900ed)
ec8f744a Add script to update liblzma from upstream
 2016-06-30 09:47:33 -04:00
Brad King
b399d13568 Merge topic 'CM_OVERRIDE-cmTypeMacro' 
4e8480db cmTypeMacro: mark overridden functions with CM_OVERRIDE
 2016-06-30 09:47:31 -04:00
Brad King
0639e23920 Merge topic 'CM_OVERRIDE-clang' 
3f77655d CM_OVERRIDE: fix feature test for clang
 2016-06-30 09:47:28 -04:00
Brad King
c05d240ef7 Help: Document CMAKE_TRY_COMPILE_PLATFORM_VARIABLES example 
Suggested-by: Hendrik Sattler <post@hendrik-sattler.de>
 2016-06-30 09:03:41 -04:00
Brad King
dab3ccf294 InstallRequiredSystemLibraries: Document UCRT option use case 
Suggested-by: Hendrik Sattler <post@hendrik-sattler.de>
 2016-06-30 08:54:46 -04:00
Kitware Robot
2c759971e4 CMake Nightly Date Stamp 2016-06-30 00:01:07 -04:00
Brad King
108c665877 Merge branch 'release' 2016-06-29 13:25:21 -04:00
Konstantin Podsvirov
9e505285e3 CPackIFW: Using cpack_append_list_variable_set_command 
This is necessary for proper processing of the list items.
 2016-06-29 19:14:05 +03:00
Konstantin Podsvirov
cd1415b548 CPackComponents: add cpack_append_list_variable_set_command 
It's like add variable, but wrap each item to quotes.
Can be used for multi args properties.
 2016-06-29 19:10:41 +03:00
Brad King
60212979ea Merge branch 'upstream-liblzma' into update-liblzma 
* upstream-liblzma:
  liblzma 2014-12-21 (265e5ffb)
 2016-06-29 10:14:03 -04:00
liblzma upstream
e4d3914639 liblzma 2014-12-21 (265e5ffb) 
Code extracted from:

    http://git.tukaani.org/xz.git

at commit 265e5ffb70d9c175b424621576294d28807efd9b (v5.0.8).
 2016-06-29 10:08:26 -04:00
Brad King
d4f524040e liblzma: Revise update script to get version 5.0.8 2016-06-29 10:07:48 -04:00
Brad King
bf96919806 Merge branch 'upstream-liblzma' into update-liblzma 2016-06-29 10:06:53 -04:00
Brad King
ca4276e435 liblzma: Remove CMake-specific README 
We will now manage the liblzma source tree updates using
the `Utilities/Scripts/update-liblzma.bash` script.  Drop
the README that covered the old method.
 2016-06-29 10:06:16 -04:00
liblzma upstream
d38a37ea15 liblzma 2013-06-30 (b69900ed) 
Code extracted from:

    http://git.tukaani.org/xz.git

at commit b69900ed0b2f914fc6c0a180dcb522dbe5b80ea7 (v5.0.5).
 2016-06-29 10:02:54 -04:00
Daniel Pfeifer
ec8f744a11 Add script to update liblzma from upstream 2016-06-29 10:01:33 -04:00
Brad King
dd71ec2c93 CMake 3.6.0-rc4 2016-06-29 09:51:33 -04:00
Brad King
7808ba0852 Merge branch 'release' 2016-06-29 09:50:09 -04:00
Brad King
b5ec5b0901 Avoid using KWSys auto_ptr by adopting it ourselves 
Replace use of cmsys::auto_ptr with a CM_AUTO_PTR macro that maps to
our own implementation adopted from the KWSys auto_ptr implementation.
Later we may be able to map CM_AUTO_PTR to std::auto_ptr on compilers
that do not warn about it.

Automate the client site conversions:

    git grep -l auto_ptr -- Source/ | grep -v Source/kwsys/ | xargs sed -i \
      's|cmsys::auto_ptr|CM_AUTO_PTR|;s|cmsys/auto_ptr.hxx|cm_auto_ptr.hxx|'
 2016-06-29 09:47:58 -04:00
Brad King
d582c23a47 try_compile: Add policy CMP0066 to honor CMAKE_<LANG>_FLAGS_<CONFIG> 
In the `try_compile` source file signature we propagate the caller's
value of `CMAKE_<LANG>_FLAGS` into the test project.  Extend this to
propagate `CMAKE_<LANG>_FLAGS_<CONFIG>` too instead of always using the
default value in the test project.  This will be useful, for example, to
allow the MSVC runtime library to be changed (e.g. `-MDd` => `-MTd`).
However, some projects may currently depend on this not being done,
so we need to activate the behavior using a policy.

This change was originally made by commit v3.6.0-rc1~160^2 (try_compile:
Honor CMAKE_<LANG>_FLAGS_<CONFIG> changes, 2016-04-11) but without the
policy and so had to be reverted during the 3.6 release candidate cycle.

Fixes #16174.
 2016-06-29 09:11:02 -04:00
Brad King
8d79375818 Merge topic 'GenerateExportHeader-custom-content' 
a9252441 Tests: Run clang-format on GenerateExportHeader code
 2016-06-29 09:10:29 -04:00
Brad King
a9252441b3 Tests: Run clang-format on GenerateExportHeader code 2016-06-29 09:09:54 -04:00
Brad King
5e2c638072 Merge topic 'cmliblzma-static' 
f05f5b01 cmliblzma: always build as static library
 2016-06-29 09:07:36 -04:00
Brad King
cb93dc048f Merge topic 'GenerateExportHeader-custom-content' 
843402b0 GenerateExportHeader: Add option to specify custom content
 2016-06-29 09:07:33 -04:00
Brad King
db4ba61f39 Merge topic 'revert-try_compile-config-flags' 
943fe6e3 Revert "try_compile: Honor CMAKE_<LANG>_FLAGS_<CONFIG> changes"
 2016-06-29 09:07:28 -04:00
Tobias Hunger
4e8480db54 cmTypeMacro: mark overridden functions with CM_OVERRIDE 2016-06-29 11:48:50 +02:00
Daniel Pfeifer
3f77655d06 CM_OVERRIDE: fix feature test for clang 
Clang refuses to default initialize an instance of a class that does not
have a default constructor.  Fix the check by adding default
constructors.  Don't use brace initialization like it is proposed in the
error message.  We want to test the override support independent from
the support for brace initialization.
 2016-06-29 11:33:38 +02:00