mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-20 14:10:27 -06:00
Code Issues Packages Projects Releases Wiki Activity
38,654 Commits 2 Branches 391 Tags
18153217e27d2cf560d874313557ec9fa2bcffdb
Commit Graph

38654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
18153217e2 Merge topic 'ctest_start_function_scope' 
13347740 Help: add release notes, documentation for CTEST_RUN_CURRENT_SCRIPT behavior
74092d92 cmCTestScriptHandler: Add new field ShouldRunCurrentScript

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1703
 2018-01-29 08:04:59 -05:00
Brad King
a271286f41 Merge topic 'intel-cxx17-flags' 
c3d576f5 Intel: Add C++17 compiler options
4a5727d3 Intel: Correct the C11 ext flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1711
 2018-01-29 08:04:28 -05:00
Kitware Robot
53f77fad2f CMake Nightly Date Stamp 2018-01-29 00:01:05 -05:00
Kitware Robot
e07cf68f46 CMake Nightly Date Stamp 2018-01-28 00:01:09 -05:00
Christian Pfeiffer
c3d576f5d6 Intel: Add C++17 compiler options 
Since Intel C++ 18.0, some C++17 features are supported if the flags
-std=c++17, respectively /Qstd=c++17 are given.

Fixes: #17687
 2018-01-27 15:09:58 +01:00
Christian Pfeiffer
4a5727d375 Intel: Correct the C11 ext flag 
Intel does not support a 'gnu11' standard flag, only 'c11'.
 2018-01-27 15:08:00 +01:00
Kitware Robot
1d65f68834 CMake Nightly Date Stamp 2018-01-27 00:01:14 -05:00
Kyle Edwards
13347740e2 Help: add release notes, documentation for CTEST_RUN_CURRENT_SCRIPT behavior 2018-01-26 09:28:33 -05:00
Kyle Edwards
74092d92bf cmCTestScriptHandler: Add new field ShouldRunCurrentScript 
This is to avoid scope issues with CTEST_RUN_CURRENT_SCRIPT. If
ctest_start() is called within a function scope, the value of
CTEST_RUN_CURRENT_SCRIPT that it sets doesn't make it to the global
scope. With this change, ctest_start() no longer sets
CTEST_RUN_CURRENT_SCRIPT, and instead sets a field directly in
cmCTestScriptHandler. The old behavior of CTEST_RUN_CURRENT_SCRIPT
has also been kept for projects and tests that rely on setting it.
 2018-01-26 09:27:22 -05:00
Brad King
a24dbba348 Merge topic 'test-genex-speedup' 
d71be346 Tests: Speed up RunCMake.TargetPropertyGeneratorExpressions
234a069d Tests: Speed up RunCMake.GeneratorExpression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1701
 2018-01-26 08:28:43 -05:00
Brad King
0e793e7bed Merge topic 'dedup-uv-signal-hack' 
3ec5f7c1 De-duplicate cmUVSignalHackRAII
1ad58d30 cmUVSignalHackRAII: Use nullptr instead of NULL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1699
 2018-01-26 08:28:08 -05:00
Brad King
f343106b19 Merge topic 'ctest-chrono' 
e6a80ccf Make use of std::chrono throughout every component
ff62b005 CTest: add safe conversion from cmDuration to integer types
695951bc CTest: introduce cmDuration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1592
 2018-01-26 08:27:37 -05:00
Brad King
b50fb70be8 Merge topic 'update-curl' 
cd8e31a1 Merge branch 'upstream-curl' into update-curl
af9e6540 curl 2018-01-23 (d6c21c8e)
e9c8ea75 curl: Update script to get curl 7.58.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1696
 2018-01-26 08:26:57 -05:00
Kitware Robot
9a52b80d06 CMake Nightly Date Stamp 2018-01-26 00:01:07 -05:00
Brad King
d71be346a4 Tests: Speed up RunCMake.TargetPropertyGeneratorExpressions 
Consolidate similar test cases.
 2018-01-25 12:08:13 -05:00
Brad King
234a069de3 Tests: Speed up RunCMake.GeneratorExpression 
Avoid enabling languages in cases that do not need them.
 2018-01-25 10:50:20 -05:00
Brad King
7c30a3a3c3 Merge topic 'doc-dev-release' 
bb33bb65 Help/dev: Add log step to 'release' branch instructions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1700
 2018-01-25 09:47:45 -05:00
Brad King
bb33bb657e Help/dev: Add log step to 'release' branch instructions 
Extend the maintainer guide with a reminder to self-review the
new ancestry of the `release` and `master` branches to ensure
that nothing unexpected was merged.
 2018-01-25 09:44:36 -05:00
Brad King
3ec5f7c1a2 De-duplicate cmUVSignalHackRAII 
This was added separately in `cmCTestMultiProcessHandler` and
`cmQtAutoGenerator`.  Factor out the duplicate code into a common header
for re-use.
 2018-01-25 09:22:47 -05:00
Brad King
1ad58d3032 cmUVSignalHackRAII: Use nullptr instead of NULL 2018-01-25 09:21:39 -05:00
Brad King
fa3ac83af0 Merge topic 'CPackDeb-help-typo' 
99ba188c CPackDeb: Fix typo in documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1697
 2018-01-25 08:37:40 -05:00
Brad King
d1d8daf15a Merge topic 'xl-qoptfile' 
c4dc6485 XL: Enable use of response files for includes and objects
e342e410 Makefile,Ninja: Use tool-specific response file flag for include dirs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1691
 2018-01-25 08:36:47 -05:00
Brad King
499e36d932 Merge topic 'fix-cray-pic' 
b886b46c Cray: Add common PIC flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1692
 2018-01-25 08:36:17 -05:00
Brad King
5c724c4ca8 Merge topic 'server-polish-opt-handshake' 
239a3ef8 Server-mode: Document protocol version for optional handshake arguments
9b1a3d24 Server-mode: Rename functions to reflect what they do

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1693
 2018-01-25 08:35:28 -05:00
Brad King
aaf3c5b32c Merge topic 'RemoveKDevelop3' 
551bd0b3 Generators: adjust error message for the removed KDevelop3 generator
9198e6a2 Generators: remove KDevelop3 generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1688
 2018-01-25 08:34:53 -05:00
Brad King
721647c8e5 Merge topic 'update-kwsys' 
f8e89468 Merge branch 'upstream-KWSys' into update-kwsys
7a756570 KWSys 2018-01-23 (0579db1c)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1695
 2018-01-25 08:34:21 -05:00
Brad King
76f5a87cf1 Merge topic 'sourceFile-new-properties' 
04483111 sourceFile properties: add property INCLUDE_DIRECTORIES
3073bd1f VisualStudio generators: refactoring
78b1c2e0 sourceFile properties: add property COMPILE_OPTIONS
3f935e69 LocalGenerator: refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1596
 2018-01-25 08:33:35 -05:00
Brad King
03050c5689 Merge topic 'fix-include_regular_expression-subdir' 
2d64f9f0 include_regular_expression: Fix propagation to subdirectories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1690
 2018-01-25 08:31:03 -05:00
Brad King
312512e2ba Merge topic 'windows-resources-through-link' 
c3b80e86 Windows: Add support for running CMake tools through a symlink

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1680
 2018-01-25 08:30:25 -05:00
Brad King
e46ca12acf Merge topic 'stdstring' 
25243014 cmMakefile: use std::string in more methods; cleanup c_str()s

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1685
 2018-01-25 07:59:08 -05:00
Kitware Robot
5189c1e322 CMake Nightly Date Stamp 2018-01-25 00:02:30 -05:00
Tobias Svehagen
99ba188c23 CPackDeb: Fix typo in documentation 2018-01-24 20:35:55 +01:00
Brad King
c4dc6485eb XL: Enable use of response files for includes and objects 
The IBM XL compiler supports response files via `-qoptfile=<file>`
instead of `@<file>`.
 2018-01-24 14:31:53 -05:00
Brad King
e342e4100a Makefile,Ninja: Use tool-specific response file flag for include dirs 
When we use a response file for `-I` flags, not all compilers support
the `@<file>` syntax.  Define `CMAKE_<LANG>_RESPONSE_FILE_FLAG` to
specify tool-specific flag, just as we do for linking already via
`CMAKE_<LANG>_RESPONSE_FILE_LINK_FLAG`.
 2018-01-24 14:31:53 -05:00
Brad King
cd8e31a1bf Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2018-01-23 (d6c21c8e)
 2018-01-24 14:18:16 -05:00
Curl Upstream
af9e654045 curl 2018-01-23 (d6c21c8e) 
Code extracted from:

    https://github.com/curl/curl.git

at commit d6c21c8eec597a925d2b647cff3d58ac69de01a0 (curl-7_58_0).
 2018-01-24 14:14:23 -05:00
Brad King
e9c8ea7557 curl: Update script to get curl 7.58.0 2018-01-24 14:14:04 -05:00
Brad King
f8e8946815 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-01-23 (0579db1c)
 2018-01-24 14:11:07 -05:00
KWSys Upstream
7a75657084 KWSys 2018-01-23 (0579db1c) 
Code extracted from:

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

at commit 0579db1c97715f9936523dd473c0ed7613b68e68 (master).

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

Ben Boeckel (1):
      3e807fd6 cmake: specify source file extensions

Brad King (1):
      38855ca1 Set CMP0042 explicitly with CMake 3.0 and above

Chuck Atkins (1):
      4ca97fc6 SystemTools: Disable getpwnam for static linux builds

Hans Johnson (1):
      7d7f3b2d Configure: Add KWSYS_NULLPTR macro for C++ code

Sankhesh Jhaveri (1):
      20c458d0 Set CMP0022 policy to new to provide link interface definitions

Sean McBride (1):
      c6829e4d Fixed a few comments, mostly regarding base 2 vs base 10 sizes

luz.paz (1):
      4b67f965 Remove superfluous double whitespace in appropriate places
 2018-01-24 14:11:06 -05:00
Tobias Hunger
239a3ef821 Server-mode: Document protocol version for optional handshake arguments 
Document which Protocol version only needs the build directory to be passed
during a handshake.

This is available a bit earlier than that, but from all I can tell 1.2 is
the earliest version where that feature is reliably available.
 2018-01-24 17:31:20 +01:00
Tobias Hunger
9b1a3d244b Server-mode: Rename functions to reflect what they do 
Rename the test* static functions to getOrTest* to better reflect
what they do now.
 2018-01-24 17:01:40 +01:00
Chuck Atkins
b886b46ccb Cray: Add common PIC flags 
Fixes #17208
 2018-01-24 09:09:08 -06:00
Marc Chevrier
0448311179 sourceFile properties: add property INCLUDE_DIRECTORIES 2018-01-24 15:10:10 +01:00
Pavel P
c3b80e8664 Windows: Add support for running CMake tools through a symlink 
When `cmake.exe` is executed through a symlink, `GetModuleFileNameW`
will return location of the link instead of the real path of
`cmake.exe`.  This results in the following error output:

    CMake Error: Could not find CMAKE_ROOT !!!
    CMake has most likely not been installed correctly.

Use `cmSystemTools::GetRealPath` in `FindCMakeResources` on Windows
to resolve any symlink returned by `GetModuleFileNameW`.
 2018-01-24 08:59:33 -05:00
Brad King
05e9cdb81e Merge topic 'GenerateExportHeader-include-guard' 
b1ae9aaf GenerateExportHeader: add release notes, tests for include guard changes
f4082b0e GenerateExportHeader: add INCLUDE_GUARD_NAME option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1643
 2018-01-24 08:53:05 -05:00
Brad King
1a9da3c055 Merge topic 'cpack_trace' 
93bc5848 CPack: accept --trace and --trace-expand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1583
 2018-01-24 08:52:03 -05:00
Brad King
56fd8b3c72 Merge topic 'UseJava-native-headers-generation' 
4829ea23 add_jar: add option GENERATE_NATIVE_HEADERS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1675
 2018-01-24 08:51:32 -05:00
Brad King
2de6aa846f Merge topic 'vcxproj-spaces' 
da1a500c cmVisualStudio10TargetGenerator: remove redundant space char in some tags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1684
 2018-01-24 08:50:01 -05:00
Brad King
52573b3239 Merge topic 'generic-inc-sep-typo-remove' 
cd3e1600 GenericSystem: Remove misspelled flag default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !1683
 2018-01-24 08:49:17 -05:00
Brad King
06d607271e Merge topic 'libuv-restore-fmode' 
98628de8 Extend libuv file translate mode workaround to all executables
3b588ac5 cpack: Enable MSVC debug hook earlier

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1686
 2018-01-24 08:36:35 -05:00