mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-07 22:59:56 -05:00
Code Issues Packages Projects Releases Wiki Activity
47,805 Commits 2 Branches 401 Tags
22d2354ec5909ad8de3d6eea75554852076c8939
Commit Graph

47805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 e608a6ef20 Merge topic 'update-kwiml' 
7bfe2924f4 Merge branch 'upstream-KWIML' into update-kwiml
bd202202ce KWIML 2020-04-20 (4abfeaa7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4639
 2020-04-21 08:14:26 -04:00
Brad King c02d2a4b21 Merge branch 'release-3.17' 2020-04-21 07:44:32 -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
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
Kitware Robot 441a5f73c0 CMake Nightly Date Stamp 2020-04-21 00:01:15 -04: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
Brad King 7bfe2924f4 Merge branch 'upstream-KWIML' into update-kwiml 
# By KWIML Upstream
* upstream-KWIML:
  KWIML 2020-04-20 (4abfeaa7)
 2020-04-20 08:42:21 -04:00
KWIML Upstream bd202202ce KWIML 2020-04-20 (4abfeaa7) 
Code extracted from:

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

at commit 4abfeaa780c5107013f264c0517107b48b43bba4 (master).

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

Ben Boeckel (1):
      a079afc6 cmake: don't set the minimum version

Hernan Martinez (1):
      4abfeaa7 abi.h: Add pointer size and endianess for Windows on ARM64
 2020-04-20 08:42:21 -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
Alexander Grund 56b3375f3e BoostScanDeps: Fix typo in numpy handling 
Fix a typo from commit e66e8e8914 (BoostScanDeps: Special case python
and numpy and variants, 2017-08-22, v3.10.0-rc1~229^2~1).
 2020-04-20 08:27:31 -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
Brad King a0a861b27f Merge topic 'FindPkgConfig-frameworks' 
95ead38375 FindPkgConfig: fix handling of frameworks
b7304f35b3 Tests: simplify FindPkgConfig_CMAKE_{FRAMEWORK,APPBUNDLE}_PATH tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3814
 2020-04-20 08:09:57 -04:00
Brad King ab61ee1b5b Merge topic 'update-kwsys' 
b6ce851bef Merge branch 'upstream-KWSys' into update-kwsys
363ec4f585 KWSys 2020-04-17 (54845345)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4621
 2020-04-20 08:03:55 -04:00
Brad King be88264abe Merge topic 'ninja-fortran-doc' into release-3.17 
fa31c195b8 Ninja: Document that Fortran support is available with Ninja 1.10+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4626
 2020-04-20 07:53:49 -04:00
Brad King cd307fb303 Merge branch 'release-3.17' 2020-04-20 07:53:49 -04:00
Brad King aae1efc7d2 Merge topic 'ninja-fortran-doc' 
f2fa7d20b2 Merge branch 'backport-3.17-ninja-fortran-doc' into ninja-fortran-doc
fa31c195b8 Ninja: Document that Fortran support is available with Ninja 1.10+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4626
 2020-04-20 07:53:49 -04:00
Kitware Robot 04e05550bb CMake Nightly Date Stamp 2020-04-20 00:01:34 -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
Marc Chevrier 3fdae5acaa Genex: Add generator expressions $<DEVICE_LINK> and $<HOST_LINK> 
These generator expressions can only be used in link options properties.
These expressions return the arguments respectively for device and host link
step, otherwise return an empty string.
 2020-04-19 15:04:54 +02:00
Craig Scott 348a2a9734 Merge topic 'ctest-memcheck-sanitizers' 
e03d3c08f0 CTest: Fix '-T MemCheck' command-line support for sanitizers
82b6091776 Tests: Fix RunCMake.ctest_memcheck test script syntax errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4618
 2020-04-19 07:07:13 -04:00
Kitware Robot 53b773113d CMake Nightly Date Stamp 2020-04-19 00:01:15 -04:00
Rolf Eike Beer 95ead38375 FindPkgConfig: fix handling of frameworks 2020-04-18 17:14:56 +02:00
Rolf Eike Beer b7304f35b3 Tests: simplify FindPkgConfig_CMAKE_{FRAMEWORK,APPBUNDLE}_PATH tests 
These tests are only run on Apple platforms, so remove code for all other
platforms form them.
 2020-04-18 15:26:02 +02:00
Marc Chevrier df2d39bc51 Merge topic 'findpython-fix-indentation' 
62b51845db FindPython: fix some indentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4623
 2020-04-18 05:43:26 -04:00
Marc Chevrier 38332fc4fa cmGeneratorExpressionDAGChecker: introduce method Top() 2020-04-18 11:29:43 +02:00
Marc Chevrier 40d1735681 Merge topic 'add-contains-to-cmext-algorithm' 
aacd4e4a90 Refactoring: add cm::contains to <cmext/algorithm>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4606
 2020-04-18 05:27:52 -04: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
Kitware Robot fbf8db89e4 CMake Nightly Date Stamp 2020-04-18 00:01:14 -04:00
Brad King f2fa7d20b2 Merge branch 'backport-3.17-ninja-fortran-doc' into ninja-fortran-doc 2020-04-17 11:04:56 -04:00
Brad King fa31c195b8 Ninja: Document that Fortran support is available with Ninja 1.10+ 
Ninja 1.10 was released in Jan 2020 and has the features we need
to support Fortran.  Replace documentation that mentions Kitware's
branch with mention of Ninja 1.10+ instead.
 2020-04-17 10:58:53 -04:00
Brad King ff3860b725 Merge topic 'update-gitsetup' 
51581a4b4b Merge branch 'upstream-GitSetup' into update-gitsetup
58696abdfe GitSetup 2020-04-17 (b162f746)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4624
 2020-04-17 10:17:55 -04:00
Brad King 51581a4b4b Merge branch 'upstream-GitSetup' into update-gitsetup 
# By GitSetup Upstream
* upstream-GitSetup:
  GitSetup 2020-04-17 (b162f746)
 2020-04-17 10:13:26 -04:00
GitSetup Upstream 58696abdfe GitSetup 2020-04-17 (b162f746) 
Code extracted from:

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

at commit b162f7465b8163be49ba6d0ea9400f418c2fbb9d (setup).
 2020-04-17 10:13:26 -04:00
Brad King acc4d1b226 Merge topic 'setup-user-portable' 
22aff63653 setup-user: restore portability

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4612
 2020-04-17 09:11:47 -04:00
Ben Boeckel 62b51845db FindPython: fix some indentation 2020-04-17 09:00:26 -04:00
Brad King 0e3695b661 Merge topic 'doc-set_property-append-empty' 
ad937fb36c Help: Document that set_property APPEND ignores empty values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4622
 2020-04-17 08:51:11 -04:00
Brad King e03d3c08f0 CTest: Fix '-T MemCheck' command-line support for sanitizers 
In commit 49948f7221 (ctest_memcheck: Add support for ThreadSanitizer,
2014-07-07, v3.1.0-rc1~322^2~1) and commit 1e005eadbc (CTest: Fix
MemoryCheckType from 'ctest -T MemCheck', 2014-07-15, v3.1.0-rc1~298^2),
the `CMakeCommand` internal setting was left set only when using `ctest
-S` scripts.  Instead simply use CTest's corresponding CMake directly
without passing it through an internal setting.

Fixes: #20584
 2020-04-17 08:36:01 -04:00
Brad King ad937fb36c Help: Document that set_property APPEND ignores empty values 
Fixes: #20581
 2020-04-17 08:09:06 -04:00
Brad King 8bc757c8f6 Merge branch 'release-3.17' 2020-04-17 08:07:30 -04:00
Brad King ee79216b82 Merge topic 'ios_multi_arch_fix' into release-3.17 
170e598add iOS: Fix detection of supported SDK architectures

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alexander Köplinger <alex.koeplinger@outlook.com>
Merge-request: !4615
 2020-04-17 08:07:29 -04:00
Brad King ea2f95f4b9 Merge topic 'ios_multi_arch_fix' 
170e598add iOS: Fix detection of supported SDK architectures

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alexander Köplinger <alex.koeplinger@outlook.com>
Merge-request: !4615
 2020-04-17 08:07:29 -04:00
Brad King d601a2c75c Merge topic 'FindPython-dev-subcomponents' 
c1b4044d3e FindPython: add sub-components to Development component

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4616
 2020-04-17 08:05:39 -04:00
Brad King b6ce851bef Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-04-17 (54845345)
 2020-04-17 07:05:19 -04:00