mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity
47,948 Commits 2 Branches 385 Tags
3ffd2741c1e062162950ffb7ba2c0b291c91e596
Commit Graph

10450 Commits

Author SHA1 Message Date
Brad King
e16c318331 Merge topic 'patch-11' 
4197aadecb OpenWatcom: Add Linux support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4669
 2020-04-30 09:57:48 -04:00
Jiri Malak
4197aadecb OpenWatcom: Add Linux support 
It is native Linux support for Linux host executable only (only static
library support, no shared library support).
 2020-04-29 07:56:15 -04:00
Marc Chevrier
e67dba730e FindPython: fix error on FPHSA call 2020-04-29 13:41:56 +02:00
Brad King
959acdc9e6 Merge topic 'FindLibXslt-targets' 
8a90ef5a44 FindLibXslt: use LIBXSLT_LIBRARY as cache variable
1aa7df4114 FindLibXslt: provide imported targets
dd506714f4 FindLibXslt: identify libexslt include directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4650
 2020-04-29 07:33:50 -04:00
Brad King
505bc9c87b Merge topic 'FindVulkan-env-sdk-first' 
5c40e5ddb4 FindVulkan: Prefer VULKAN_SDK env var before standard paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4663
 2020-04-29 07:32:17 -04:00
Brad King
d968ec380b Merge topic 'openwatcom-platform-independence' 
d3640dbdd5 OpenWatcom: Organize and update C/C++ toolchain command lines
7aa9e89b1c OpenWatcom: Move non-Windows settings to Modules/Compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4666
 2020-04-29 07:31:11 -04:00
Brad King
c9fdee6a67 Merge topic 'FindPython-find-implementations' 
d2c47c822b FindPython: Add capability to specify Python implementations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4676
 2020-04-29 07:30:24 -04:00
Markus Rickert
8a90ef5a44 FindLibXslt: use LIBXSLT_LIBRARY as cache variable 
Use LIBXSLT_LIBRARY as cache variable instead of LIBXSLT_LIBRARIES to adhere to documented conventions.
Check for defined LIBXSLT_LIBRARIES value to support backwards compatibility.
 2020-04-28 19:14:03 +02:00
Markus Rickert
1aa7df4114 FindLibXslt: provide imported targets 2020-04-28 19:14:03 +02:00
Markus Rickert
dd506714f4 FindLibXslt: identify libexslt include directory 2020-04-28 19:12:18 +02:00
Jiri Malak
d3640dbdd5 OpenWatcom: Organize and update C/C++ toolchain command lines 2020-04-28 09:36:05 -04:00
Jiri Malak
7aa9e89b1c OpenWatcom: Move non-Windows settings to Modules/Compiler 
Restructure OpenWatcom toolchain support files to simplify adding of new
targets DOS, OS/2 and Linux including cross-compilation.
 2020-04-28 09:36:04 -04:00
Marc Chevrier
d2c47c822b FindPython: Add capability to specify Python implementations 
Through hint Python_FIND_IMPLEMENTATIONS it is possble to specify, as an
ordered list, which implementations must be searched for.
Currently possible values are:
* CPython
* IronPython
 2020-04-28 13:56:18 +02:00
pheonix xx
5c40e5ddb4 FindVulkan: Prefer VULKAN_SDK env var before standard paths 
Reference the environment variable as HINTS instead of PATHS.

Fixes: #20637
 2020-04-28 07:25:55 -04:00
Brad King
73f81c5070 Merge topic 'FindLAPACK-target' 
4ed936d1b8 FindLAPACK: Provide the LAPACK::LAPACK import target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4677
 2020-04-28 07:18:41 -04:00
Brad King
4bc4e14899 Merge topic 'FindBoost-1.73' 
69ed51960b FindBoost: Prevent warning with boost 1.73

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4662
 2020-04-28 07:14:09 -04:00
Orgad Shaneh
69ed51960b FindBoost: Prevent warning with boost 1.73 
In commit 9daf79c53b (FindBoost: Add support for Boost 1.73, 2020-04-19)
we forgot to update the version comparison for the warning.
 2020-04-27 14:34:02 -04:00
Robert Maynard
4ed936d1b8 FindLAPACK: Provide the LAPACK::LAPACK import target 2020-04-27 14:19:02 -04:00
Brad King
9e3d982e05 Merge topic 'FindPython-reason-failure' 
a7eca04163 FindPython: fix reason failure propagation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4660
 2020-04-27 10:41:20 -04:00
Brad King
0ae7232334 Merge topic 'FindBLAS-target' 
85a9813a76 BLAS: Provide the BLAS::BLAS import target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4657
 2020-04-27 10:39:30 -04:00
Marc Chevrier
a7eca04163 FindPython: fix reason failure propagation 2020-04-24 15:47:05 +02:00
Brad King
360862f845 Merge topic 'FindPython-fix-python-compiler-validation' 
f39da773ee FindPython: fix python compiler validation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4655
 2020-04-24 08:36:17 -04:00
Robert Maynard
85a9813a76 BLAS: Provide the BLAS::BLAS import target 2020-04-23 13:59:33 -04:00
Marc Chevrier
f39da773ee FindPython: fix python compiler validation 
Ensure also the cache of properties is erased in case of multiple
searches.

Fixes: #20626, #20627
 2020-04-23 17:47:22 +02:00
Brad King
61ac8e6dfa Merge topic 'remove-documentation-module' 
306a1ba960 Modules/Documentation: remove
ad4487a96a cmIncludeCommand: add infrastructure for deprecated modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4617
 2020-04-23 09:15:24 -04:00
Brad King
b779cb13b4 Merge topic 'ninja-compiler-PATH-windows' 
e01990999a Ninja: On Windows, select the compiler occurring first in PATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4625
 2020-04-23 09:13:56 -04:00
Ben Boeckel
306a1ba960 Modules/Documentation: remove 
This is an old module from when VTK and other Kitware projects drove the
addition of commands and modules into CMake itself. Modern VTK doesn't
need this module and it can be ignored.

This module is kept around so that the ancient VTK versions which use it
are not broken by it. VTK itself stopped using the module in 2012 and
the last usage by an example in VTK was removed in 2020.

Fixes: #20591
 2020-04-22 10:46:03 -04:00
Brad King
370def7b3e Merge topic 'FindSquish-windows' 
c77c92791c FindSquish: Fix setting the application under test
879b279154 FindSquish: Fix launching the Squish server process on Windows
0bc4fa2be2 FindSquish: Fix finding on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4620
 2020-04-22 08:34:24 -04:00
Brad King
e01990999a Ninja: On Windows, select the compiler occurring first in PATH 
On Windows, toolchains like MSVC require a set of environment variables
to be configured for the compiler to work correctly.  The scripts that
prepare these environments typically put the compiler's directory ahead
of others in the `PATH`.  Teach the Ninja generators to use this as a
heuristic to select the compiler when none is explicitly specified.

This is not necessary with Makefile generators because each toolchain's
environment comes with its own make tool variant, and the corresponding
Makefile generator (e.g. "NMake Makefiles") automatically implies the
matching compiler.

Fixes: #20585
 2020-04-22 08:03:16 -04:00
Brad King
a583360d10 Merge topic 'external-project-mkdir-step-fix' 
e5b33871ed ExternalProject: Fix step dependency on mkdir step

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4640
 2020-04-21 08:21:46 -04:00
Brad King
a0cf159b9b Merge topic 'FindMPI-msmpi-env' 
faa0c62106 FindMPI: Normalize paths from MSMPI environment variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4644
 2020-04-21 08:20:48 -04:00
Brad King
22d2354ec5 Merge topic 'nasm-with-CXX' 
3328e0a387 NASM: Fix object format when CXX is enabled but not C

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4642
 2020-04-21 08:17:43 -04:00
Brad King
cd957389f2 Merge topic 'findpython-remove-unneeded-guard' 
c6ba196314 FindPython: remove unnecessary if check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4641
 2020-04-21 08:16:39 -04:00
Brad King
dba914aa31 Merge topic 'ti-compilers-fix-cxx' 
65c1320719 Compiler/TI: Fix C++ toolchain command-lines
4110d9dffb Compiler/TI: Fix linker command line for C++

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4627
 2020-04-21 08:15:31 -04:00
Brad King
4a5de69e09 Merge topic 'FindBoost-1.73' into release-3.17 
9daf79c53b FindBoost: Add support for Boost 1.73
f48051d33f FindBoost: Simplify Boost_VERSION_STRING comparisons
56b3375f3e BoostScanDeps: Fix typo in numpy handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4635
 2020-04-21 07:44:31 -04:00
Brad King
3465ae916f Merge topic 'FindBoost-1.73' 
9daf79c53b FindBoost: Add support for Boost 1.73
f48051d33f FindBoost: Simplify Boost_VERSION_STRING comparisons
56b3375f3e BoostScanDeps: Fix typo in numpy handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4635
 2020-04-21 07:44:31 -04:00
Frederik Gladhorn
c77c92791c FindSquish: Fix setting the application under test 
The AUT (application under test) was previously set by trying to extract the target location,
which is no longer supported.
 2020-04-20 22:20:11 +02:00
Frederik Gladhorn
879b279154 FindSquish: Fix launching the Squish server process on Windows 
There are countless posts (e.g. stack overflow) that start /b takes a window title as first argument.
Once I added a random string there the server was started and things started to work.
 2020-04-20 22:20:11 +02:00
Brad King
faa0c62106 FindMPI: Normalize paths from MSMPI environment variables 
Fixes: #20606
 2020-04-20 13:39:06 -04:00
Vyacheslav Yurkov
e5b33871ed ExternalProject: Fix step dependency on mkdir step 
When looking at `list(FIND)` result, zero index is ignored due to
incorrect error handling, and users can't set dependencies on mkdir
step.

Fixes: #20605
 2020-04-20 18:49:17 +02:00
Christian Feldmann
3328e0a387 NASM: Fix object format when CXX is enabled but not C 
Check CXX data pointer size if C is not set.
 2020-04-20 11:07:30 -04:00
Ben Boeckel
c6ba196314 FindPython: remove unnecessary if check 
`list(REMOVE_DUPLICATES)` is safe on empty lists since 3.14.
 2020-04-20 10:30:09 -04:00
Alexander Grund
9daf79c53b FindBoost: Add support for Boost 1.73 
Run `Utilities/Scripts/BoostScanDeps.cmake` with the Boost 1.73.0
sources to compute dependencies.

This includes a new Boost.Nowide library.

Special case: Boost.Filesystem is an optional dependency as the include
is only required to make Boost.Filesystem use UTF-8 paths on user
request
 2020-04-20 08:27:32 -04:00
Alexander Grund
f48051d33f FindBoost: Simplify Boost_VERSION_STRING comparisons 2020-04-20 08:27:32 -04:00
Brad King
5d32699975 Merge topic 'device-link' 
4248bb452a CUDA: Device linking use now link options
ec48e023f6 CUDA: Add information for LINKER: pattern translation
3fdae5acaa Genex: Add generator expressions $<DEVICE_LINK> and $<HOST_LINK>
38332fc4fa cmGeneratorExpressionDAGChecker: introduce method Top()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4577
 2020-04-20 08:14:16 -04:00
Marc Chevrier
4248bb452a CUDA: Device linking use now link options 
properties LINK_OPTIONS and INTERFACE_LINK_OPTIONS are propagated
to the device link step.

To control which options are selected for normal link and device link steps,
the $<DEVICE_LINK> and $<HOST_LINK> generator expressions can be used.

Fixes: #18265
 2020-04-19 15:53:11 +02:00
Marc Chevrier
ec48e023f6 CUDA: Add information for LINKER: pattern translation 2020-04-19 15:04:56 +02:00
Rolf Eike Beer
95ead38375 FindPkgConfig: fix handling of frameworks 2020-04-18 17:14:56 +02:00
Alekseev Alexey
65c1320719 Compiler/TI: Fix C++ toolchain command-lines 
Applied commit 5a0fc68312 (TI: Fix C toolchain command-lines, 2020-03-03) for C++:
Fix `armar` arguments.  Fix the linker `--map_file=` argument.
Enable response files.
 2020-04-18 12:12:20 +03:00
Alekseev Alexey
4110d9dffb Compiler/TI: Fix linker command line for C++ 
Just like C, libraries must be in the last part of the linker.
Commit 89317915d9 (Compiler/TI: Pass libraries as last part to linker, 2016-06-02)
 2020-04-18 12:12:20 +03:00