mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-02 20:00:38 -06:00
Code Issues Packages Projects Releases Wiki Activity
47,352 Commits 2 Branches 385 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph

47352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
3766633b8a Merge topic 'FindRuby-variable-case' 
e672db628b FindRuby: Rename variables to match case of module name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Frank Dana <ferdnyc@gmail.com>
Merge-request: !4463
 2020-03-13 11:01:56 -04:00
Brad King
200bc3b785 Merge topic 'swift-implicit-module-include-dir' 
2026915f8f Swift: Propagate Swift_MODULE_DIRECTORY as include directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4320
 2020-03-13 11:00:39 -04:00
Brad King
1b5554e863 Merge topic 'profiling' 
9aa4640792 cmake: add command line options to output script profiling data

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Pavel Solodovnikov <hellyeahdominate@gmail.com>
Acked-by: Leonid Pospelov <pospelovlm@yandex.ru>
Acked-by: Cristian Adam <cristian.adam@gmail.com>
Merge-request: !2760
 2020-03-13 10:59:03 -04:00
Alexander Stein
32bc6aa9b6 GoogleTest: Add release note for XML_OUTPUT_DIR 2020-03-13 10:47:34 -04:00
Alexander Stein
0001339a6f GoogleTest: Add test case for XML_OUTPUT_DIR 2020-03-13 10:47:33 -04:00
Alexander Stein
e9ab39eb1d GoogleTest: Add XML_OUTPUT_DIR parameter 
When executing googltests in parallel using 'ctest -j n' and using
'--gtest_output=xml' there is a race condition upon file creation.
See googletest issue https://github.com/google/googletest/issues/2506.

As all testcases (potentially) can be run in parallel each testcase has
to create it's own XML JUnit file. EXTRA_ARGS is not suitable because it
is identical per testsuite.
So instead a new (opitional) parameter has been introduced to specify
the storage location for each test of the testsuite.
 2020-03-13 10:47:33 -04:00
Brad King
c3ab1c22b0 Merge topic 'GoogleTest-gtest_discover_tests-failure' 
2ba8ac07ed GoogleTest: Fix CTest not failing if gtest_discover_tests fails
2c9680eec5 GoogleTest: Add missing test case for gtest_discover_tests failure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Steffen Seckler <steffen.seckler@tum.de>
Acked-by: Matthew Woehlke <matthew.woehlke@kitware.com>
Merge-request: !4466
 2020-03-13 10:46:20 -04:00
Brad King
ba216592fc Merge topic 'cuda_language' 
f75bea1071 CUDA: Abstract language flag to compiler modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4464
 2020-03-13 10:43:57 -04:00
Alexandru Croitor
67a592583d Source: Remove trailing whitespace from export generation code 2020-03-13 15:31:38 +01:00
Vitaly Stakhovsky
73d52a862b cmPropertyDefinition: Construct directly in defined state 
Move `cmPropertyDefinitionMap::DefineProperty` functionality
directly into the constructor to avoid an intermediate state.
 2020-03-13 10:24:51 -04:00
Brad King
9728839b9e ASM: Fix executable link lines with GNU 'as' tool as CMAKE_ASM_COMPILER 
The GNU `as` tool does not know how to drive linking like the C compiler
does.  When using `as` as the compiler, use the linker directly.
 2020-03-13 09:55:36 -04:00
Brad King
5932f0be4f ASM: Fix depfile flags for GNU 'as' tool 
The GNU `as --help` shows `--MD <file>` as an option to generate depfiles
as needed by Ninja.  There is no `-MT <target>` flag but fortunately the
generated files automatically account for the `-o <obj>` flag.

Issue: #20426
 2020-03-13 09:55:36 -04:00
Kitware Robot
78fd95fc1d CMake Nightly Date Stamp 2020-03-13 00:01:11 -04:00
Brad King
2181807e28 Merge branch 'release-3.17' 2020-03-12 12:58:47 -04:00
Brad King
7da0545e65 Merge topic 'generated-byproducts-docs' 
3eb2b62d21 Help: Expand discussion of GENERATED / BYPRODUCTS
1853c7f571 Help: Add missing word in AUTOGEN_TARGET_DEPENDS.rst

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4472
 2020-03-12 12:58:47 -04:00
Brad King
02fa6fd134 Merge topic 'generated-byproducts-docs' into release-3.17 
3eb2b62d21 Help: Expand discussion of GENERATED / BYPRODUCTS
1853c7f571 Help: Add missing word in AUTOGEN_TARGET_DEPENDS.rst

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4472
 2020-03-12 12:58:46 -04:00
FeRD (Frank Dana)
3eb2b62d21 Help: Expand discussion of GENERATED / BYPRODUCTS 
- Mention the Makefile Generators' `make clean` removal in the
  BYPRODUCTS section of add_custom_command and add_custom_target
- Expand the GENERATED property docs' description of which files will
  be marked with the property, and of what it implies (including
  `make clean` removal)
 2020-03-12 11:55:10 -04:00
FeRD (Frank Dana)
1853c7f571 Help: Add missing word in AUTOGEN_TARGET_DEPENDS.rst 2020-03-12 11:55:10 -04:00
Saleem Abdulrasool
2026915f8f Swift: Propagate Swift_MODULE_DIRECTORY as include directory 
Teach include directory computation for Swift to implicitly propagate
the `Swift_MODULE_DIRECTORY` of all linked targets as include
directories.  This is required to ensure that the swiftmodule of a
linked target is accessible to the compiler of the current target.

Fixes: #19272
 2020-03-12 11:50:43 -04:00
Brad King
cb8227ecbf Merge branch 'release-3.17' 2020-03-12 11:06:33 -04:00
Brad King
0d0aa98c84 ASM: Record vendor-specific output matched to identify assembler 
For example, with GNU `as`, we match `GNU assembler`, but with GNU `gcc`
as the assembler, we do not match anything.  Distinguishing these cases
may be useful for constructing assembler command lines.
 2020-03-12 10:07:30 -04:00
Brad King
ee3ec27465 CMakeDetermineCompilerId: Set locale to C for vendor output match 
Apply the change from commit d751d2d2ed (CMakeDetermineCompilerABI: set
locale to C for try_compile(), 2019-01-14, v3.14.0-rc1~108^2~1) to the
`CMAKE_DETERMINE_COMPILER_ID_VENDOR` implementation too.
 2020-03-12 10:07:29 -04:00
Brad King
1ec72e0947 CMake 3.17.0-rc3 v3.17.0-rc3 2020-03-12 09:45:24 -04:00
Brad King
9116daf2cd Merge branch 'release-3.17' 2020-03-12 09:33:19 -04:00
Brad King
2ca34f0685 Merge topic 'apple-clang-flags-c++17' 
a67f2d00d8 Apple Clang: add flags for C++17 standard

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4468
 2020-03-12 09:33:19 -04:00
Brad King
c852c0d138 Merge topic 'apple-clang-flags-c++17' into release-3.17 
a67f2d00d8 Apple Clang: add flags for C++17 standard

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4468
 2020-03-12 09:33:18 -04:00
Brad King
0cf40eec64 Merge branch 'release-3.16' 2020-03-12 09:32:24 -04:00
Brad King
d584d01103 Merge topic 'swift-link-line-spaces' into release-3.17 
af39d1b993 Swift: Fix quoting of library search paths with spaces

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4469
 2020-03-12 09:32:01 -04:00
Brad King
e3e906d35f Merge branch 'release-3.17' 2020-03-12 09:32:01 -04:00
Brad King
1e3af78f63 Merge topic 'swift-link-line-spaces' 
af39d1b993 Swift: Fix quoting of library search paths with spaces

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4469
 2020-03-12 09:32:01 -04:00
Brad King
5a896bbc55 Merge branch 'swift-link-line-spaces' into release-3.16 
Merge-request: !4469
 2020-03-12 08:49:20 -04:00
Saleem Abdulrasool
af39d1b993 Swift: Fix quoting of library search paths with spaces 
The library search paths added by commit 2746c61e6d (Swift: Add library
search paths for dependencies, 2019-06-09, v3.16.0-rc1~561^2) need to be
quoted properly on command lines to handle spaces and such.  This was
already done by `cmLinkLineComputer::ComputeLinkPath` for
non-Swift-specific link directories.
 2020-03-12 08:46:11 -04:00
Brad King
f86d8009c6 Merge topic 'add-cache-definition' 
36a5b3d1d1 cmMakefile::AddCacheDefinition: Add overload that accepts std::string value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4457
 2020-03-12 08:26:07 -04:00
Brad King
74954a6657 Merge topic 'modernize-memory-management' 
f964739ead cmCTestRunTest: modernize memory management

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4454
 2020-03-12 08:25:20 -04:00
Brad King
0683f2e9e4 Merge topic 'CMakeFindFrameworks-CMAKE_FRAMEWORK_PATH' 
c841d43d70 CMakeFindFrameworks: Search CMAKE_FRAMEWORK_PATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4461
 2020-03-12 08:24:22 -04:00
Brad King
3cf22df42e Merge topic 'ctest-curl-debugfunction' into release-3.17 
7a1cce210b CTest: Fix our internal CURL_DEBUGFUNCTION to conform to CURL docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4459
 2020-03-12 08:19:43 -04:00
Brad King
1e0b062182 Merge branch 'release-3.17' 2020-03-12 08:19:43 -04:00
Brad King
7ed1d5c342 Merge topic 'ctest-curl-debugfunction' 
7a1cce210b CTest: Fix our internal CURL_DEBUGFUNCTION to conform to CURL docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4459
 2020-03-12 08:19:43 -04:00
Brad King
88e921f661 Merge branch 'release-3.17' 2020-03-12 08:18:55 -04:00
Brad King
c278b4eda9 Merge topic 'FindPython-ENV-CMAKE_FRAMEWORK_PATH' into release-3.17 
1044776472 FindPython: Convert env CMAKE_FRAMEWORK_PATH to CMake path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Marc Chevrier <marc.chevrier@gmail.com>
Merge-request: !4462
 2020-03-12 08:18:54 -04:00
Brad King
3a49ea6f25 Merge topic 'FindPython-ENV-CMAKE_FRAMEWORK_PATH' 
1044776472 FindPython: Convert env CMAKE_FRAMEWORK_PATH to CMake path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Marc Chevrier <marc.chevrier@gmail.com>
Merge-request: !4462
 2020-03-12 08:18:54 -04:00
Brad King
159da18e65 Merge branch 'release-3.17' 2020-03-12 08:18:04 -04:00
Brad King
fffbafc607 Merge topic 'swift-rpath' 
f481b3a947 Swift: repair RPATH handling for macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4456
 2020-03-12 08:18:04 -04:00
Brad King
c5f850d145 Merge topic 'swift-rpath' into release-3.17 
f481b3a947 Swift: repair RPATH handling for macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4456
 2020-03-12 08:18:03 -04:00
Marc Chevrier
a67f2d00d8 Apple Clang: add flags for C++17 standard 2020-03-12 08:09:12 -04:00
Craig Scott
9fd5ca4e66 Merge branch 'release-3.17' 2020-03-12 06:52:12 -04:00
Craig Scott
3d388e5e98 Merge topic 'rename-macho-version-properties' into release-3.17 
14732d3f30 macOS: Rename OSX_*_VERSION properties to MACHO_*_VERSION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4452
 2020-03-12 06:52:11 -04:00
Craig Scott
54863e28ce Merge topic 'rename-macho-version-properties' 
14732d3f30 macOS: Rename OSX_*_VERSION properties to MACHO_*_VERSION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4452
 2020-03-12 06:52:11 -04:00
Brad King
14732d3f30 macOS: Rename OSX_*_VERSION properties to MACHO_*_VERSION 
The properties added by commit 4a62e3d97c (macOS: Add
OSX_COMPATIBILITY_VERSION and OSX_CURRENT_VERSION properties,
2020-01-24, v3.17.0-rc1~80^2~1) are general-purpose for all platforms
using Mach-O formats and not just on OS X.  Rename them accordingly.
The properties are new to the CMake 3.17 release so we can rename
them without compatibility concerns.

Fixes: #20442
 2020-03-12 21:15:40 +11:00
Kitware Robot
662d17e910 CMake Nightly Date Stamp 2020-03-12 00:01:09 -04:00