mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-26 02:38:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
48,026 Commits 2 Branches 391 Tags
adef7c09d0086aeb9ffd41bfe0aa11bcaf79e2be
Commit Graph

48026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
adef7c09d0 Merge topic 'ow-mult-platforms' 
4adfd2a3aa OpenWatcom: Add cross-compilation support for Windows
43c3243c2d OpenWatcom: Fix Linux support file
d26eea220a OpenWatcom: Add OS/2 target support
0ab583d787 OpenWatcom: Add DOS target support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4702
 2020-05-07 09:35:43 -04:00
Brad King
07d567c0ce Merge topic 'FindVulkan-use-SDK-env-variable' 
590cde6125 FindVulkan: Prefer VULKAN_SDK env var before standard paths on UNIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4714
 2020-05-07 09:34:41 -04:00
Brad King
0dcb436fab Merge topic 'compiler-sysroot-slashes' 
2e831e4a17 Windows: Normalize slashes in compiler -print-sysroot path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4715
 2020-05-07 09:33:11 -04:00
Craig Scott
b743ffbfa2 Merge topic 'script-mode-and-arbitrary-args' 
e4f1b301fe cmake: Allow arbitrary args passed to CMake script

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4707
 2020-05-07 09:09:52 -04:00
Kitware Robot
51d82407fc CMake Nightly Date Stamp 2020-05-07 00:01:12 -04:00
Jiri Malak
4adfd2a3aa OpenWatcom: Add cross-compilation support for Windows 
Add system header files directories for cross-compilation
 2020-05-06 13:10:43 -04:00
Jiri Malak
43c3243c2d OpenWatcom: Fix Linux support file 
Fix CMAKE_SHARED_LINKER_FLAGS_INIT macro
Fix executable file name for Linux to be without extension
Add system header files directory for cross-compilation
 2020-05-06 13:09:58 -04:00
Jiri Malak
d26eea220a OpenWatcom: Add OS/2 target support 
OS/2 16-bit and 32-bit target support files for cross-compilation by
OpenWatcom.

It is used if CMAKE_SYSTEM_NAME=OS2 is defined.

If CMAKE_SYSTEM_PROCESSOR=I86 is defined then 16-bit OS/2 target is
used, otherwise 32-bit OS/2 target is used.
 2020-05-06 13:09:28 -04:00
Jiri Malak
0ab583d787 OpenWatcom: Add DOS target support 
DOS 16-bit and 32-bit target support files for cross-compilation by
OpenWatcom.

It is used if CMAKE_SYSTEM_NAME=DOS is defined.

If CMAKE_SYSTEM_PROCESSOR=I86 is defined then 16-bit DOS target is used,
otherwise 32-bit DOS target is used.
 2020-05-06 13:09:00 -04:00
Patric Schmitz
590cde6125 FindVulkan: Prefer VULKAN_SDK env var before standard paths on UNIX 
Also document the variable.

Fixes: #18346
 2020-05-06 16:07:49 +02:00
Brad King
8406f71eae Merge topic 'bootstrap-test' 
3e874e8834 bootstrap: Prefer “test … && test …” over “test … -a …”
1c06060288 bootstrap: Prefer “test …” over “[ … ]”

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4704
 2020-05-06 09:32:53 -04:00
Brad King
b86dfa2056 Merge topic 'gtest-space-in-parameter' 
839a1010a3 GoogleTestAddTests: Fix output processing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4694
 2020-05-06 09:31:53 -04:00
Brad King
f6178df27d Merge branch 'release-3.16' 2020-05-06 09:30:49 -04:00
Brad King
27f6eb13a3 Merge branch 'release-3.17' 2020-05-06 09:28:31 -04:00
Brad King
1aecbda756 Merge topic 'FindPkgConfig-isystem' 
502e562940 Merge branch 'backport-3.17-FindPkgConfig-isystem' into FindPkgConfig-isystem
e9d93c3731 Help: Add 3.17 release note for FindPkgConfig '-isystem' fix
dfaaae67a3 Merge branch 'backport-3.16-FindPkgConfig-isystem'
cd31a8acef FindPkgConfig: also handle "-isystem" prefixes for include directories
4d446c68d1 FindPkgConfig: also handle "-isystem" prefixes for include directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4693
 2020-05-06 09:28:30 -04:00
Brad King
6ccbf6ba71 Merge topic 'FindPkgConfig-isystem' into release-3.17 
e9d93c3731 Help: Add 3.17 release note for FindPkgConfig '-isystem' fix
dfaaae67a3 Merge branch 'backport-3.16-FindPkgConfig-isystem'
4d446c68d1 FindPkgConfig: also handle "-isystem" prefixes for include directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4693
 2020-05-06 09:28:30 -04:00
Brad King
84c49ff5d1 Merge branch 'release-3.17' 2020-05-06 09:27:13 -04:00
Brad King
4ec59891ad Merge topic 'CheckLanguage-cuda-host' into release-3.17 
5b304a7503 CheckLanguage: Fix forwarding of CMAKE_CUDA_HOST_COMPILER

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4711
 2020-05-06 09:27:13 -04:00
Brad King
1cadb625f2 Merge topic 'CheckLanguage-cuda-host' 
5b304a7503 CheckLanguage: Fix forwarding of CMAKE_CUDA_HOST_COMPILER

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4711
 2020-05-06 09:27:13 -04:00
Brad King
2e831e4a17 Windows: Normalize slashes in compiler -print-sysroot path 
Since commit 8cc384f629 (Compilers: Add paths from -print-sysroot to
system prefix path, 2020-03-25) we detect the compiler `-print-sysroot`
output and save it.  On Windows, the value may include backslashes.
Convert the path to CMake's forward-slash convention for storage.

Fixes: #20679
 2020-05-06 08:25:58 -04:00
Brad King
6687a82000 Merge branch 'backport-3.16-FindPkgConfig-isystem' into release-3.16 
Merge-request: !4693
 2020-05-06 07:50:20 -04:00
Brad King
502e562940 Merge branch 'backport-3.17-FindPkgConfig-isystem' into FindPkgConfig-isystem 2020-05-06 07:48:23 -04:00
Brad King
e9d93c3731 Help: Add 3.17 release note for FindPkgConfig '-isystem' fix 2020-05-06 07:46:35 -04:00
Brad King
dfaaae67a3 Merge branch 'backport-3.16-FindPkgConfig-isystem' 2020-05-06 07:45:55 -04:00
Alex Turbov
e4f1b301fe cmake: Allow arbitrary args passed to CMake script 2020-05-06 21:40:36 +10:00
Kitware Robot
00065e2087 CMake Nightly Date Stamp 2020-05-06 00:01:16 -04:00
Issam Maghni
3e874e8834 bootstrap: Prefer “test … && test …” over “test … -a …” 
From https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html
 2020-05-05 12:42:40 -04:00
Issam Maghni
1c06060288 bootstrap: Prefer “test …” over “[ … ]” 
The former is more portable.
 2020-05-05 12:42:28 -04:00
Rolf Eike Beer
cd31a8acef FindPkgConfig: also handle "-isystem" prefixes for include directories 
Fixes: #20652
 2020-05-05 18:38:50 +02:00
Rolf Eike Beer
4d446c68d1 FindPkgConfig: also handle "-isystem" prefixes for include directories 
Fixes: #20652
 2020-05-05 18:30:38 +02:00
Brad King
f9283f005b Merge branch 'CheckLanguage-cuda-host' into release-3.16 
Merge-request: !4711
 2020-05-05 10:00:54 -04:00
Brad King
5b304a7503 CheckLanguage: Fix forwarding of CMAKE_CUDA_HOST_COMPILER 
Fix the condition added by commit fada8cbfd6 (CheckLanguage: Report
CMAKE_CUDA_HOST_COMPILER if needed for compilation, 2019-05-31,
v3.15.0-rc1~12^2) to activate CUDA-specific logic.  The old condition
had worked in our test suite only by accident because the loop variable
used in the test happened to be the name and value that the old
condition used!  Update the test to use a different name.

Fixes: #19013
 2020-05-05 09:50:29 -04:00
Brad King
d3d53eefee Merge topic 'remove_cli__symbols' 
be75622e49 bindexplib: Do not export symbols from managed code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4692
 2020-05-05 09:07:25 -04:00
Brad King
2013c30c7b Merge topic 'FindBoost-1.73' into release-3.17 
a1e04be913 FindBoost: Update MinGW compiler tag for Boost 1.73

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Boris Basic <baljci@hotmail.com>
Merge-request: !4706
 2020-05-05 09:05:18 -04:00
Brad King
6a5daced18 Merge branch 'release-3.17' 2020-05-05 09:05:18 -04:00
Brad King
e99e5418b4 Merge topic 'FindBoost-1.73' 
a1e04be913 FindBoost: Update MinGW compiler tag for Boost 1.73

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Boris Basic <baljci@hotmail.com>
Merge-request: !4706
 2020-05-05 09:05:18 -04:00
Brad King
5ef074f726 Merge topic 'FindBoost-1.73' into release-3.17 
5e8d66f431 FindBoost: Add 1.73 to known versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4708
 2020-05-05 09:04:09 -04:00
Brad King
62fed74d4c Merge branch 'release-3.17' 2020-05-05 09:04:09 -04:00
Brad King
bf8c3fcd18 Merge topic 'FindBoost-1.73' 
5e8d66f431 FindBoost: Add 1.73 to known versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4708
 2020-05-05 09:04:09 -04:00
Brad King
2136f51995 Merge branch 'release-3.17' 2020-05-05 09:02:49 -04:00
Brad King
54d9ffc6da Merge topic 'bootstrap-solaris-tr' 
9febdd8205 bootstrap: Use 'tr' more portably

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4703
 2020-05-05 09:02:49 -04:00
Brad King
2bcd622080 Merge topic 'bootstrap-solaris-tr' into release-3.17 
9febdd8205 bootstrap: Use 'tr' more portably

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4703
 2020-05-05 09:02:48 -04:00
Stefan Floeren
839a1010a3 GoogleTestAddTests: Fix output processing 
The function gtest_discover_tests calls the passed test executable with
the parameter --gtest_list_tests and parses the output to find all
tests.

In case of value-parameterized tests ([1]), the test values are included
in the output. While test names are alphanumeric, the values can contain
arbitrary content.

First, the output is separated into lines with `foreach`. Included
semi-colons breaks this and need to get escaped.

Afterwards, the testname is passed on to the `add_command` helper. This
helper was converted into a macro in commit dac201442d (GoogleTest:
Optimize gtest_discover_tests, 2020-02-18). As a macro, its arguments
are re-evaluated. Therefore we need to escape `\`, `;` and to prevent
unwanted variable expansion `$`.

Fixes: #20661

[1] <https://github.com/google/googletest/blob/0eea2e9/googletest/docs/advanced.md#value-parameterized-tests>
 2020-05-05 07:23:17 +00:00
Kitware Robot
671daf1998 CMake Nightly Date Stamp 2020-05-05 00:01:15 -04:00
Brad King
a1e04be913 FindBoost: Update MinGW compiler tag for Boost 1.73 
Boost 1.73 on MinGW no longer uses the compiler minor version in
its library names if the major version is at least 5.

Fixes: #20673
 2020-05-04 14:05:40 -04:00
Boris Basic
5e8d66f431 FindBoost: Add 1.73 to known versions 
This was accidentally left out of commit 9daf79c53b (FindBoost: Add
support for Boost 1.73, 2020-04-19, v3.17.2~9^2).
 2020-05-04 12:13:20 -04:00
Brad King
8541628e27 Merge topic 'patch-7' 
086c20e9a6 OpenWatcom: Enable 16-bit targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4665
 2020-05-04 11:04:28 -04:00
Brad King
d08e748040 Merge topic 'FindPython-pypy' 
c1ef70d4d1 FindPython: Add support for 'PyPy'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4701
 2020-05-04 11:03:23 -04:00
Brad King
aa45f3f25f Merge topic 'gcc8-unused-function' 
1b4ab323fd Fix build warnings for unused functions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4697
 2020-05-04 11:02:01 -04:00
Brad King
9febdd8205 bootstrap: Use 'tr' more portably 
Since commit 380bd70cc2 (bootstrap: implement cmake_toupper() using tr,
2017-06-07, v3.10.0-rc1~548^2~2) we use `tr` to convert from lower to
upper case.  However, the character classes `[:lower:]` and `[:upper:]`
result in a "Bad string" error message on Solaris.  Use `[a-z]` and
`[A-Z]` instead.
 2020-05-04 09:41:52 -04:00