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
48,957 Commits 2 Branches 391 Tags
c17167cdcb6131b3fbbfdbad124db6903a5f71c3
Commit Graph

10689 Commits

Author SHA1 Message Date
Brad King
6b246f9198 Merge topic 'darwin-init-var-cleanup' 
2af6857562 Darwin: prefix internal osx variables with "_" to hide them from users

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4967
 2020-07-03 07:34:11 -04:00
Chuck Cranor
2af6857562 Darwin: prefix internal osx variables with "_" to hide them from users 
A simple CMakeLists.txt on osx shows that variable "d" is set
(but empty) by the system modules.  this pollutes the user's
variable namespace.  I noticed this when I created a library
target "d" and got unexpected policy CMP0054 warnings when
trying to find_package(d CONFIG REQUIRED) (triggered from the
generated "d-targets.cmake" ...).   Note that non-"_" prefixed
internal variables are ok within functions due to scoping rules.

Fixes: #20898
 2020-07-03 07:33:25 -04:00
Brad King
476b6be497 Merge topic 'find-libraries-NAMES_PER_DIR' 
0d9d8dd054 FindPNG use NAMES_PER_DIR
e6908b65b4 FindGIF use NAMES_PER_DIR
45ea7f9c80 FindGLEW use NAMES_PER_DIR
8e671f2564 FindLAPACK use NAMES_PER_DIR
ec6bbfd58d FindIntl use NAMES_PER_DIR
667a229e8d FindProtobuf use NAMES_PER_DIR
64d37b4953 FindLibLZMA use NAMES_PER_DIR
9d2c119ff5 FindJPEG use NAMES_PER_DIR
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4961
 2020-07-03 07:27:44 -04:00
Brad King
b516ada836 Merge topic 'FindGTest-no_release_support' 
a064b18f85 FindGTest: Allow either "Debug" or "Release" configurations.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4950
 2020-07-02 08:37:51 -04:00
Brad King
ba889a0b28 Merge topic 'FindLua-5.4' 
bbb7f0e271 FindLua: Add support for Lua 5.4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4959
 2020-07-02 08:34:27 -04:00
Sibi Siddharthan
0d9d8dd054 FindPNG use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:44:08 +05:30
Sibi Siddharthan
e6908b65b4 FindGIF use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:43:40 +05:30
Sibi Siddharthan
45ea7f9c80 FindGLEW use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:43:04 +05:30
Sibi Siddharthan
8e671f2564 FindLAPACK use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:42:24 +05:30
Sibi Siddharthan
ec6bbfd58d FindIntl use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:42:02 +05:30
Sibi Siddharthan
667a229e8d FindProtobuf use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:41:17 +05:30
Sibi Siddharthan
64d37b4953 FindLibLZMA use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:40:36 +05:30
Sibi Siddharthan
9d2c119ff5 FindJPEG use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:40:09 +05:30
Sibi Siddharthan
a2a1d5a038 FindIconv use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:39:12 +05:30
Sibi Siddharthan
943bdc7fbd FindEXPAT use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:38:40 +05:30
Sibi Siddharthan
6c77c61532 FindCURL use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:38:11 +05:30
Sibi Siddharthan
739278e971 FindBZip2 use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:37:34 +05:30
Sibi Siddharthan
764696dcd0 FindBLAS use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:37:04 +05:30
Sibi Siddharthan
903a65ce0d FindArmadillo use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:36:14 +05:30
Felix Yan
bbb7f0e271 FindLua: Add support for Lua 5.4 2020-07-01 10:55:32 -04:00
Brad King
57ea001247 Merge topic 'FindTIFF-tiffxx' 
a468cc431c FindTIFF: add component CXX to include the C++ wrapper libtiffxx

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4934
 2020-07-01 07:02:09 -04:00
William Reid Paape
a064b18f85 FindGTest: Allow either "Debug" or "Release" configurations. 
Call select_library_configurations on GTest library variable basenames "GTEST"
and "GTEST_MAIN" before passing ${basename}_LIBRARY variables to
find_package_handle_standard_args.  This allows either _DEBUG or _RELEASE
library variants to be found for find_package() to pass, whereas the original
version would require the presence of _RELEASE variants.

Fixes: #17799
 2020-06-30 18:31:19 -05:00
Brad King
f67a787a38 Merge topic 'find_vulkan_glslc' 
467509d767 FindVulkan: Support for finding glslc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4944
 2020-06-30 07:27:27 -04:00
Joachim Wuttke (h)
a468cc431c FindTIFF: add component CXX to include the C++ wrapper libtiffxx 
Fixes: #20860
 2020-06-29 11:55:22 -04:00
Brad King
a6732df925 Merge topic 'gtest-xml-output' 
75aa3ee7e7 GoogleTest: Fix name generation for XML_OUTPUT_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4942
 2020-06-29 08:21:08 -04:00
Brad King
4c28bf2aca Merge topic 'gtest-xml-output' into release-3.18 
75aa3ee7e7 GoogleTest: Fix name generation for XML_OUTPUT_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4942
 2020-06-29 08:21:07 -04:00
Brad King
b1992cf9bd Merge topic 'intel-c++20' 
85b151ff5b Merge branch 'backport-intel-c++20' into intel-c++20
99c8dbf497 Intel: Add flags for C++20

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4946
 2020-06-29 08:16:17 -04:00
Brad King
df8ba4f10d Merge topic 'intel-c++20' into release-3.18 
99c8dbf497 Intel: Add flags for C++20

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4946
 2020-06-29 08:16:16 -04:00
Ryan Kawicki
467509d767 FindVulkan: Support for finding glslc 
The GLSL SPIR-V compiler is part of the Vulkan SDK and may be used
by projects for compiling shaders as part of the build process.
This is not strictly required to build a Vulkan application, which
is why the variable is not part of the REQUIRED_VARs for the module.
 2020-06-26 20:57:06 -05:00
Stefan Floeren
75aa3ee7e7 GoogleTest: Fix name generation for XML_OUTPUT_DIR 
The Google test framework allows to write the results into an XML file
since commit e9ab39eb1d (GoogleTest: Add XML_OUTPUT_DIR parameter,
2020-03-06, v3.18.0-rc1~538^2~2).  This file is passed on the command
line: `--gtest_output=xml:FILE_NAME`.

The module allows to specify a directory to save those files with
**TEST_XML_OUTPUT_PARAM**.

If the option is set, the filename will be set to
`${prefix}${pretty_suite}.${pretty_test}${suffix}.xml`.

The pretty names contain parameters for the tests, if
value-parameterized tests are used. These parameters may not be safe to
use in file names.

There are two possible options:

1. sanitize the file name
2. omit the values and use the internal numbering of gtest

This commit chose option 2. The testname needs to be a valid C++
identifier and should therefore be reasonable for a filename.

Note that the generated names contain slashes. This will lead to
subdirectories, but works on both Linux and Windows.

Fixes: #20877
 2020-06-26 09:39:51 -04:00
Brad King
ab83a21933 Merge topic 'visual-studio-android' 
6051a49c78 Visual Studio: Add Android support
bbcaf9689e Refactor: Add IsAndroidGuiExecutable() method to cmTarget
14456923bd cmGlobalVisualStudio10Generator: Move variable initialization to header
d5b5c19278 cmGlobalGenerator: FindMakeProgram() before CMakeDetermineSystem

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4898
 2020-06-26 09:35:31 -04:00
Brad King
ba222d9fb0 Merge topic 'GoogleTest-DISCOVERY_MODE-cleanups' 
1458b4c048 Help: Add CMAKE_GTEST_DISCOVER_TESTS_DISCOVERY_MODE to release notes
642ea49115 GoogleTest: Replace SEND_ERROR with FATAL_ERROR
09c38e8de6 Tests: Don't ask for things not required for GoogleTest

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4938
 2020-06-26 09:31:20 -04:00
Brad King
85b151ff5b Merge branch 'backport-intel-c++20' into intel-c++20 2020-06-26 08:24:46 -04:00
Brad King
99c8dbf497 Intel: Add flags for C++20 
Patch-by: Matheus Izvekov
Fixes: #20880
 2020-06-26 08:21:21 -04:00
Kyle Edwards
6051a49c78 Visual Studio: Add Android support 2020-06-24 08:41:09 -04:00
Craig Scott
642ea49115 GoogleTest: Replace SEND_ERROR with FATAL_ERROR 
We want to fail and halt immediately upon any error, not continue
past a fatal problem.
 2020-06-24 21:57:19 +10:00
evatux
56e645a4c3 Find{BLAS,LAPACK}: Add missing thread library for Intel MKL on Win32 
The patch also updates the documentation to explicitly state
that Intel10_32 stands for threaded case (linked with Intel OpenMP).
Later, one may need to add Intel10_32_seq to support linking
with the sequential version of Intel MKL.

Fixes: #20857
 2020-06-23 09:16:14 -07:00
Brad King
ba0ff76af3 Merge topic 'VxWorks-platform-id' into release-3.18 
b22586be01 VxWorks: Add Platform ID for Modules/CMakePlatformId.h.in

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4922
 2020-06-23 08:00:31 -04:00
Brad King
8c4d11fa52 Merge topic 'VxWorks-platform-id' 
b22586be01 VxWorks: Add Platform ID for Modules/CMakePlatformId.h.in

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4922
 2020-06-23 08:00:31 -04:00
Lihua Zhao
b22586be01 VxWorks: Add Platform ID for Modules/CMakePlatformId.h.in 2020-06-23 07:59:32 -04:00
Brad King
069e904337 Merge topic 'fix-win-flex-bison' into release-3.18 
0faa2b9870 Find{FLEX,BISON}: Add 'win-' executable names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4931
 2020-06-23 07:56:39 -04:00
Brad King
0a337716ce Merge topic 'fix-win-flex-bison' 
0faa2b9870 Find{FLEX,BISON}: Add 'win-' executable names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4931
 2020-06-23 07:56:39 -04:00
Brad King
df69cb37d1 Merge topic 'FindCUDA-11' into release-3.18 
1d9f2f9714 FindCUDA: Do not search for the deprecated nppicom when CUDA >= 11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4929
 2020-06-23 07:55:40 -04:00
Brad King
d80a370e75 Merge topic 'FindCUDA-11' 
1d9f2f9714 FindCUDA: Do not search for the deprecated nppicom when CUDA >= 11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4929
 2020-06-23 07:55:40 -04:00
Yan
0faa2b9870 Find{FLEX,BISON}: Add 'win-' executable names 
Distributions of these tools on Windows now use a `win-` prefix
instead of the previously-seen `win_` prefix.  Search for both.
 2020-06-22 15:50:22 -04:00
Robert Maynard
1d9f2f9714 FindCUDA: Do not search for the deprecated nppicom when CUDA >= 11 
The nppicom library has been removed in preference of nvjpeg starting
in CUDA 11.

Fixes: #20845
 2020-06-22 11:56:51 -04:00
Brad King
c19b5765e1 Merge topic 'FindSDL-update' 
9ffd2c70bf FindSDL: Add SDL_INCLUDE_DIRS, SDL_LIBRARIES, and SDL::SDL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4902
 2020-06-19 08:16:40 -04:00
Brad King
21d0961bc2 Merge topic 'CUDAToolkit-cuda-11' into release-3.18 
b284a3c764 CudaToolkit: Update for new/removed libraries in CUDA 11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4917
 2020-06-19 08:13:08 -04:00
Brad King
09d46e9bb6 Merge topic 'CUDAToolkit-cuda-11' 
b284a3c764 CudaToolkit: Update for new/removed libraries in CUDA 11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4917
 2020-06-19 08:13:08 -04:00
Brad King
0741c50275 Merge topic 'cuda-toolkit-vs' 
a0280801f4 CUDA: Fix CMAKE_CUDA_COMPILER_TOOLKIT_ROOT detection in Visual Studio
90be0916b5 CUDA: Re-order some logic for determining the compiler
4ab5f109f0 CUDA: Remove unused variables while determining compiler
492e5f01fa CUDA: Simplify CMAKE_CUDA_COMPILER_TOOLKIT_ROOT computation
4785bd6153 CUDA: Skip the entire search for nvcc when it is CMAKE_CUDA_COMPILER

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4921
 2020-06-19 08:12:04 -04:00