mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-20 22:20:50 -06:00
Code Issues Packages Projects Releases Wiki Activity
40,535 Commits 2 Branches 391 Tags
708b3fecfe4ea4f92f49bb5eea5c9eed370a5956
Commit Graph

40535 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
708b3fecfe Merge topic 'gicv-stdstring' 
13d10ee616 cmState::GetInitializedCacheValue: Return as const std::string*

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2365
 2018-09-12 09:38:37 -04:00
Brad King
1c1a1e08e8 Merge topic 'IAR_6_50_6_fix' 
8fdf08c097 IAR: Fix compiler id, version, and arch detection on 6.50.6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2371
 2018-09-12 09:37:58 -04:00
Brad King
920ac301b5 Merge branch 'release-3.12' 2018-09-12 09:36:46 -04:00
Brad King
8bf5c2326e Merge topic 'FindDoxygen-CMP0057' 
e8213404ce FindDoxygen: Ensure policy settings allow use of IN_LIST

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2373
 2018-09-12 09:35:45 -04:00
Craig Scott
e7a45e3ec3 Merge topic 'unused-variables-cleanup' 
2c154fec6b Warnings: Remove unused variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2364
 2018-09-12 09:32:19 -04:00
Kitware Robot
f53bd80de1 CMake Nightly Date Stamp 2018-09-12 00:01:08 -04:00
Brad King
c1fd1607b8 Merge branch 'FindDoxygen-CMP0057' into release-3.12 
Merge-request: !2373
 2018-09-11 15:55:06 -04:00
Brad King
e8213404ce FindDoxygen: Ensure policy settings allow use of IN_LIST 
In commit v3.9.0-rc1~55^2 (Improve Doxygen support, 2017-04-10)
use of the `IN_LIST` condition was added, but this is only supported
when policy CMP0057 is set to NEW.  Add a policy scope around the
module and enable the policy within it.  Otherwise it works only
in projects that happen to enable the policy.

Fixes: #18361
 2018-09-11 15:52:43 -04:00
Daniel Schürmann
8fdf08c097 IAR: Fix compiler id, version, and arch detection on 6.50.6 
The IAR 6.50.6 compiler places extra/truncated copies of the
compiler id `INFO:` strings into binaries with a prefix like
`?<Constant "`.  Teach CMakeDetermineCompilerId to ignore them.

Fixes: #18333
 2018-09-11 10:43:03 -04:00
Craig Scott
344eb9c8dc Merge topic 'gtest_add_tests-empty-file' 
31c82143bf GoogleTest: gtest_add_tests() fails if any source file is empty
d6b06d8d87 GoogleTest: Modify test to verify that empty files can be scanned

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2342
 2018-09-11 09:42:31 -04:00
Brad King
528d7625b8 Merge topic 'iar-fail-early' 
a26ebb894b IAR: Abort if compiler version or target architecture is not detected

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2353
 2018-09-11 08:31:19 -04:00
Brad King
9a5b04a5f6 Merge topic 'cmake_cpack_command-doc' 
5ff7149298 Help: Document existence of CMAKE_CPACK_COMMAND

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2367
 2018-09-11 08:30:15 -04:00
Brad King
f13d4b1077 Merge topic 'replace-os-x-name-with-macos' 
ab2e35d614 Replace occurrences of "Mac OS X" with "macOS" in comments
fc1602456a Help: Replace occurrences of "Mac OS X" with "macOS"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Gregor Jasny <gjasny@googlemail.com>
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Merge-request: !2351
 2018-09-11 08:28:05 -04:00
Brad King
e9f72e9c94 Merge topic 'docs/setdirproprs' 
6d8cabe8d4 Help: Clarify INCLUDE_DIRECTORIES directory property behavior
7b9d8ce168 Help: Clarify wording of set_directory_properties docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2337
 2018-09-11 08:26:42 -04:00
Brad King
b1c8d95dbe Merge topic 'imported-same-name' 
f35be59961 Fix transitive usage requirements through same-name imported targets
1b57f49586 genex: Simplify cmGeneratorExpressionInterpreter
bea390e9bd Fix dependency propagation through same-name imported targets
fc7e4d1ed8 cmLinkItem: Convert to a "sum type" over a string and target pointer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2359
 2018-09-11 08:20:50 -04:00
Brad King
4188b8fd6a Merge branch 'release-3.12' 2018-09-11 08:19:44 -04:00
Brad King
dcbad14d23 Merge topic 'FindMPI-restore-flags-string' 
e374b9f1eb FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS as a command-line string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Christoph Junghans <junghans@votca.org>
Reviewed-by: Christian Pfeiffer <cpfeiffer@live.de>
Merge-request: !2368
 2018-09-11 08:18:55 -04:00
Brad King
bb59e362cc Merge topic 'fix-ctest_start-track' 
09f0325eaf CTest: Fix regression in ctest_start()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2366
 2018-09-11 08:18:08 -04:00
Brad King
c669b59095 Merge topic 'ctest-fix-test-load' 
292ec157b6 CTest: Fix --test-load regression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2362
 2018-09-11 08:12:09 -04:00
Craig Scott
78d165c990 Merge topic 'generator_expressions_typo_fix' 
3914108c4a Help: Formatting typo fix in cmake-generator-expressions(7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2360
 2018-09-11 05:51:03 -04:00
Craig Scott
151fc66827 Merge topic 'cmake-host-system-information-doc-fix' 
228a2b0d82 Help: Clarify cmake_host_system_information memory units

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2339
 2018-09-11 05:48:43 -04:00
Kitware Robot
e895a8f050 CMake Nightly Date Stamp 2018-09-11 00:01:07 -04:00
Craig Scott
2c154fec6b Warnings: Remove unused variables 2018-09-11 10:20:35 +08:00
Brad King
e0e56abe34 Merge branch 'FindMPI-restore-flags-string' into release-3.12 
Merge-request: !2368
 2018-09-10 14:52:39 -04:00
Brad King
3eda5cdd93 Merge branch 'fix-ctest_start-track' into release-3.12 
Merge-request: !2366
 2018-09-10 14:35:59 -04:00
Brad King
e374b9f1eb FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS as a command-line string 
Refactoring in commit v3.10.0-rc1~103^2~2 (FindMPI: Modernization from
ground up, 2017-04-25) accidentally left this variable set as a copy of
the `;`-list in `MPI_<LANG>_COMPILE_OPTIONS`, but the flags variable is
documented as a command-line string.  Restore it now.

Fixes: #18349
 2018-09-10 14:33:29 -04:00
Kyle Edwards
09f0325eaf CTest: Fix regression in ctest_start() 
The format for the TAG file was changed in 3.12, and the way it was
read caused a regression which changed how the track was decided. This
commit fixes the regression.

Fixes #18347.
 2018-09-10 14:31:21 -04:00
Kyle Edwards
5ff7149298 Help: Document existence of CMAKE_CPACK_COMMAND 
This useful variable was previously undocumented. This commit adds
brief documentation for it.
 2018-09-10 12:36:41 -04:00
Vitaly Stakhovsky
13d10ee616 cmState::GetInitializedCacheValue: Return as const std::string* 2018-09-10 09:31:48 -04:00
Daniel Schürmann
a26ebb894b IAR: Abort if compiler version or target architecture is not detected 
If these are not detected then we cannot support the IAR compiler.
Fail early with an explicit message instead of silently proceeding
and getting strange errors.

Issue: #18333
 2018-09-10 09:03:47 -04:00
Brian Heim
6d8cabe8d4 Help: Clarify INCLUDE_DIRECTORIES directory property behavior 
Ordering w.r.t. target creation is important for this property.

Fixes: #17754
 2018-09-10 08:28:44 -04:00
Brian Heim
7b9d8ce168 Help: Clarify wording of set_directory_properties docs 2018-09-10 08:28:30 -04:00
Raul Tambre
3914108c4a Help: Formatting typo fix in cmake-generator-expressions(7) 2018-09-10 15:08:02 +03:00
Brad King
11de1492d3 Merge topic 'FindOpenSceneGraph-debug' 
192e552099 FindOpenSceneGraph: Fix find in Debug

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2341
 2018-09-10 08:01:21 -04:00
Brad King
0aab59809c Merge topic 'gicv-stdstring' 
46855d000f cmCacheManager::GetInitializedCacheValue(): Return as const std::string*

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2357
 2018-09-10 08:00:41 -04:00
Brad King
62b56b5ec9 Merge topic 'FindSubversion-wc-info-error' 
68d015fc94 FindSubversion: Add Subversion_WC_INFO option to suppress failures

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2292
 2018-09-10 07:59:42 -04:00
Brad King
d6853ef405 Merge topic 'extra-generator-split-arg1' 
0239b586bd Extra Generator: Fix handling of CMAKE_<LANG>_COMPILER_ARG1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2352
 2018-09-10 07:58:10 -04:00
Brad King
f35be59961 Fix transitive usage requirements through same-name imported targets 
If two imported targets in different directories have the same name we
should still be able to propagate transitive usage requirements from
both.  Fix the DAG checker to work with target pointers instead of
target names since the pointers will not be duplicated even if the names
are.

Fixes: #18345
 2018-09-10 07:51:44 -04:00
Brad King
68f2b471df Merge branch 'ctest-fix-test-load' into release-3.12 
Merge-request: !2362
 2018-09-10 07:40:31 -04:00
Bartosz Kosiorek
ab2e35d614 Replace occurrences of "Mac OS X" with "macOS" in comments 
Apple's main Operating system changed their name from OS X to macOS:

    https://www.engadget.com/2016/06/13/os-x-is-now-macos/

Revise source comments accordingly.
 2018-09-10 13:34:09 +02:00
Brad King
292ec157b6 CTest: Fix --test-load regression 
The `ctest --test-load` option is implemented in `StartNextTests` by not
starting any tests when the load is too high and instead sleeping and
then returning.  Prior to commit v3.11.0-rc1~117^2 (CTest: Re-implement
test process handling using libuv, 2017-12-10) our outer loop in
`RunTests` would immediately call `StartNextTests` again.  However, now
the `uv_run` loop may simply terminate if there are no tests running
because no events are left pending.

Fix this by converting the sleep in `StartNextTests` into a libuv timer
that it starts instead.  This avoids leaving `uv_run` with no pending
events.  In the case that there are other running tests this also allows
CTest to detect when they finish even if it during the wait period where
we previously slept.

This regression was not caught by the test suite because it only
verified that we do not start new tests when the load was too high and
not that we proceed to start tests when the load drops.  Revise the test
suite to cover both.

Fixes: #18338
 2018-09-10 07:32:16 -04:00
Alessandro
31c82143bf GoogleTest: gtest_add_tests() fails if any source file is empty 
Fixes #18321
 2018-09-10 16:21:48 +08:00
Craig Scott
d6b06d8d87 GoogleTest: Modify test to verify that empty files can be scanned 
The modified test confirms the bug described in issue #18321.
 2018-09-10 16:21:48 +08:00
Taylor Holberton
228a2b0d82 Help: Clarify cmake_host_system_information memory units 
The memory size query implementations report in units of one mebibyte
(2^20).  Clarify the unit in the documentation because "megabyte" might
also be interpreted as 10^6.
 2018-09-10 15:55:07 +08:00
Kitware Robot
1504c6db90 CMake Nightly Date Stamp 2018-09-10 00:01:07 -04:00
Kitware Robot
ccb6dab9f1 CMake Nightly Date Stamp 2018-09-09 00:01:08 -04:00
Kitware Robot
958518c4c5 CMake Nightly Date Stamp 2018-09-08 00:01:11 -04:00
Craig Scott
49cb2a504d Merge topic 'ExternalProject-check-explicit-include' 
df1ddeec12 ExternalProject: Report error if local variables are not defined

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !2281
 2018-09-07 19:40:24 -04:00
Jason Heeris
68d015fc94 FindSubversion: Add Subversion_WC_INFO option to suppress failures 
Subversion fails when the directory is not actually under its control.
Allow projects to tolerate this case optionally.

Fixes: #18264
 2018-09-07 16:17:28 -04:00
Adam Oleksy
0239b586bd Extra Generator: Fix handling of CMAKE_<LANG>_COMPILER_ARG1 
The "arg1" value is a command-line string so we must parse it to get
separate arguments for `execute_process`.
 2018-09-07 16:11:11 -04:00