mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-20 14:58:38 -05:00
Code Issues Packages Projects Releases Wiki Activity
38,261 Commits 2 Branches 401 Tags
362a1f336d29fb315db937dcce4dbd894bbffd2d
Commit Graph

38261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Chevrier 362a1f336d FindPerlLibs: refactoring 
Use a dedicated function (perl_get_info) to retrieve various configuration information
 2017-12-12 09:41:16 +01:00
Marc Chevrier c365a07870 FindPerlLibs: fix MacOS failure 
Fix library paths computation on MacOS

Fixes: #12544
 2017-12-12 09:38:39 +01:00
Brad King 9720c14255 Merge topic 'cpack-generator-scripts-enable-all-cmake-policies' 
93d5f464 CPack: enable all CMake policies for generator scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1582
 2017-12-11 09:00:19 -05:00
Brad King 0f57e15157 Merge topic 'ctest-remove-unfinished-batch-mode' 
f984296b CTest: Remove unfinished batch test mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1577
 2017-12-11 08:33:58 -05:00
Brad King 1efb6e566f Merge topic 'update-kwsys' 
9dee52ba Merge branch 'upstream-KWSys' into update-kwsys
3b1bb703 KWSys 2017-12-08 (2d27b1d0)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1576
 2017-12-11 08:33:25 -05:00
Kitware Robot 14fe6d431b CMake Nightly Date Stamp 2017-12-11 00:01:09 -05:00
Kitware Robot ec37222d59 CMake Nightly Date Stamp 2017-12-10 00:01:10 -05:00
Domen Vrankar 93d5f464cc CPack: enable all CMake policies for generator scripts 2017-12-09 12:50:28 +01:00
Kitware Robot 0fe1966b79 CMake Nightly Date Stamp 2017-12-09 00:01:30 -05:00
Brad King f984296ba8 CTest: Remove unfinished batch test mode 
This was partially implemented by commit v2.8.0~154 (Added some ctest
batch capabilities, 2009-09-10) but never finished.
 2017-12-08 11:23:33 -05:00
Brad King 9dee52baca Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-12-08 (2d27b1d0)
 2017-12-08 10:08:39 -05:00
KWSys Upstream 3b1bb703a2 KWSys 2017-12-08 (2d27b1d0) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 2d27b1d075d93860ee63564f635fd1710aa61208 (master).

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

Brad King (1):
      9995f700 hashtable: Drop when building inside CMake
 2017-12-08 10:08:38 -05:00
Brad King d25bcab161 Merge branch 'release-3.10' 2017-12-08 09:55:12 -05:00
Brad King 3efc6ad2a2 Merge branch 'cuda_darwin_proper_install_names_flags' into release-3.10 
Merge-request: !1570
 2017-12-08 09:54:31 -05:00
Brad King e81b7a2075 Merge topic 'cuda_darwin_proper_install_names_flags' 
ce3874b3 CUDA: Shared libraries on Darwin properly setup @rpath install_names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1570
 2017-12-08 09:53:33 -05:00
Brad King 62822ce68a Merge branch 'release-3.10' 2017-12-08 09:36:12 -05:00
Brad King 158fb9755c Merge topic 'autogen-fix-library-deps' 
1bc60334 Merge branch 'automoc-apple-framework' into autogen-fix-library-deps
a3f8371c Merge branch 'automoc-apple-framework' into autogen-fix-library-deps
bd49ae51 Autogen: Fix library dependency forwarding to _autogen target
e4ccc684 Autogen: Tests: Add test for MacOS frameworks
fcbd02fd Autogen: Fix for AUTOMOC on macOS frameworks in CMake 3.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1566
 2017-12-08 09:35:02 -05:00
Brad King bbac777698 Merge topic 'update-kwsys' 
c50f08cd Merge branch 'upstream-KWSys' into update-kwsys
5b1c84b4 KWSys 2017-12-07 (4aee0036)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1567
 2017-12-08 09:12:54 -05:00
Kitware Robot 1c40558e91 CMake Nightly Date Stamp 2017-12-08 00:01:12 -05:00
Robert Maynard ce3874b303 CUDA: Shared libraries on Darwin properly setup @rpath install_names 
Shared libraries linked with CUDA now properly setup booth the correct
install_name but also specify headerpad_max_install_names so that the names
can be changed post build.
 2017-12-07 11:31:03 -05:00
Brad King 51045535e8 Merge topic 'fix-ctest-chrono' 
be470278 CTest: Fix regression in test timeout compuatation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: dublet <github@dublet.org>
Merge-request: !1568
 2017-12-07 10:45:47 -05:00
Brad King 066fe644ee Merge branch 'automoc-apple-framework' into release-3.10 
Merge-request: !1561
 2017-12-07 09:13:45 -05:00
Brad King 1bc6033447 Merge branch 'automoc-apple-framework' into autogen-fix-library-deps 2017-12-07 09:11:34 -05:00
Brad King a3f8371c57 Merge branch 'automoc-apple-framework' into autogen-fix-library-deps 
Merge using `-s ours` merge strategy because the change is a fix
specific to the 3.10 release series, and we already have a similar fix
in post-3.10 development.
 2017-12-07 09:10:31 -05:00
Sebastian Holtermann bd49ae5109 Autogen: Fix library dependency forwarding to _autogen target 
Library dependencies of the origin target were forwarded to the
_autogen target as source file dependencies. This is fixed by
forwarding the dependencies as target dependencies instead.

Issue: #17278
 2017-12-07 09:09:19 -05:00
Sebastian Holtermann e4ccc68429 Autogen: Tests: Add test for MacOS frameworks 2017-12-07 09:05:58 -05:00
Sebastian Holtermann fcbd02fd6e Autogen: Fix for AUTOMOC on macOS frameworks in CMake 3.10 
Revert the library target dependency forwarding to the `_autogen` target
to the 3.9.6 way, only now using `GetLinkImplementationLibraries`.

Fixes: #17278
 2017-12-07 09:04:05 -05:00
Brad King be4702781d CTest: Fix regression in test timeout compuatation 
Refactoring in commit 66419bc046 (CTest: convert timeouts to
std::chrono::duration, 2017-11-20) accidentally changed the logic used
to compute the timeout for a test when it starts.  It incorrectly limits
the maximum possible timeout to 2 minutes rather than 2 minutes less
than the total allowed test time remaining.  Update the new logic to
restore the original behavior.

Avoid subtracting 2 minutes from our "infinite" timeout value to avoid
creating very large timeouts that are not "infinite" and may exceed
integer type ranges.
 2017-12-07 08:33:19 -05:00
Brad King e016d6d255 Merge topic 'cpack-rpm-check-executable-flags' 
a2031d3a CPack/RPM: check executable flags for debuginfo packages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1565
 2017-12-07 08:28:31 -05:00
Brad King e1a09cfbd1 Merge topic 'externalproject_download_dir' 
b8b87489 ExternalProject: Support substituting <DOWNLOAD_DIR>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1537
 2017-12-07 08:14:34 -05:00
Brad King 79fde6a324 Merge topic 'FindOpenCL-amd-sdk' 
f313541a FindOpenCL: Add support for AMD OpenCL SDK Light

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1562
 2017-12-07 08:13:37 -05:00
Brad King 3de52db69c Merge topic 'splitRCPatchComponent' 
f92304c7 CMakeVersion RC file: Split patch into 2 components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1552
 2017-12-07 08:11:56 -05:00
Brad King ffc9c89dae Merge branch 'release-3.10' 2017-12-07 08:09:37 -05:00
Brad King 9accb48d17 Merge topic 'revert-server-target-backtraces' 
b7100756 Merge branch 'backport-revert-server-target-backtraces' into revert-server-target-backtraces
976370d1 server: drop "ctestInfo" backtrace information
8b2736c7 server: Revert "Report backtraces in codemodel response"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1564
 2017-12-07 08:08:59 -05:00
Brad King ea63c522ef Merge topic 'gtest-discovery-timeout' 
935848a8 GoogleTest: Add test for missing test executable
29731d89 GoogleTest: Add timeout to discovery
e99e3982 GoogleTest: Improve gtest_discover_tests messages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1534
 2017-12-07 08:06:27 -05:00
Brad King afae027d63 Merge branch 'gtest-discovery-timeout' into release-3.10 
Merge-request: !1534
 2017-12-07 08:03:11 -05:00
KWSys Upstream 5b1c84b449 KWSys 2017-12-07 (4aee0036) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 4aee00361a2a38b99911318db84551eed8d3fcfc (master).

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

Brad King (1):
      09724ac8 hashtable: Avoid use of std::unary_function
 2017-12-07 07:25:03 -05:00
Brad King c50f08cdd8 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-12-07 (4aee0036)
 2017-12-07 07:25:03 -05:00
Kitware Robot f5e48edaae CMake Nightly Date Stamp 2017-12-07 00:01:14 -05:00
Craig Scott b8b8748977 ExternalProject: Support substituting <DOWNLOAD_DIR> 2017-12-07 07:22:02 +11:00
Domen Vrankar a2031d3a3a CPack/RPM: check executable flags for debuginfo packages 
Debuginfo packages can not be created from programs and
shared libraries that do not have execute permissions.
 2017-12-06 21:04:20 +01:00
Brad King 05f86af716 Merge branch 'backport-revert-server-target-backtraces' into release-3.10 
Merge-request: !1564
 2017-12-06 13:46:55 -05:00
Brad King b7100756d7 Merge branch 'backport-revert-server-target-backtraces' into revert-server-target-backtraces 2017-12-06 11:49:52 -05:00
Brad King 976370d134 server: drop "ctestInfo" backtrace information 
Backtrace information was included by commit 35a52bd1b4 (server: add
"ctestInfo" request to get test info, 2017-10-25) to match that already
provided for targets.  However, the backtrace representation uses too
much memory and needs to be dropped.  Remove it from test information.

Issue: #17502
 2017-12-06 11:45:51 -05:00
Brad King 8b2736c71c server: Revert "Report backtraces in codemodel response" 
The backtrace information is very repetitive and hugely increases the
size of the codemodel object.  We need to remove it until an alternative
representation can be developed.  Revert commit v3.10.0-rc1~393^2
(server: Report backtraces in codemodel response, 2017-06-20), except
for the protocol version number (because it indicates other new things).

Unfortunately this is incompatible with clients that expect the
"crossReferences" field in targets.  However, the regression in memory
usage is quite serious, especially on large projects, and therefore
breaks even older clients that do not use backtraces.  Since the
"crossReferences" field was only provided by one release (3.10.0), it is
simplest to revert it outright for 3.10.1.

Fixes: #17502
 2017-12-06 11:39:03 -05:00
Harry Mallon f313541adb FindOpenCL: Add support for AMD OpenCL SDK Light 2017-12-06 15:03:34 +00:00
Brad King 92910e282a Merge branch 'release-3.10' 2017-12-06 08:07:37 -05:00
Brad King dd792b08b5 Merge topic 'doc-lang-order' 
6ecd8b60 Help: Document that ASM should be enabled last

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1560
 2017-12-06 08:06:33 -05:00
Brad King 060cf73ec8 Merge topic 'src-COMPILE_DEFINITIONS-genex' 
9432f686 Add generator expression support to per-source COMPILE_DEFINITIONS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1546
 2017-12-06 08:05:31 -05:00
Brad King 98206571fb Merge topic 'update-kwsys' 
79b241de cmake-gui: Update RegexExplorer for changes to KWSys
4a8bbc52 Merge branch 'upstream-KWSys' into update-kwsys
52a5c4a8 KWSys 2017-12-05 (9376537e)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1558
 2017-12-06 08:01:20 -05:00