reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-01-31 00:41:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
47,237 Commits 4 Branches 185 Tags
Commit Graph

47237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Brad King
cb8227ecbf Merge branch 'release-3.17' 2020-03-12 11:06:33 -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
Ryan Thornton
2ba8ac07ed GoogleTest: Fix CTest not failing if gtest_discover_tests fails 
Fixes regression introduced dac201442d (GoogleTest: Optimize gtest_discover_tests, 2020-02-18).

The generated CTest include files has the form:

    if(EXISTS "foo_tests.cmake")
      include("foo_tests.cmake")
    else()
      add_test(foo_NOT_BUILT foo_test_NOT_BUILT)
    endif()

Starting in dac201442d, an empty discovery_timeout_test[1]_tests.cmake was written
as soon as GoogleTestAddTests was processed.

This meant, that even if test discovery would fail (due to a crash or timeout in the executable),
we would always produce an empty CTest file.

So instead of reporting:
   Unable to find executable: foo_NOT_BUILT
   Errors while running CTest

We instead get:
   No tests were found!!!

To fix the problem, we WRITE the file on the first call to flush_script,
thus creating the file once we know we have valid output
and the call to gtest_discover_tests hasn't failed.

After creating the file, we then set the mode to APPEND
and append to the file for every subsequent call.
 2020-03-11 15:11:00 -05:00
Ryan Thornton
2c9680eec5 GoogleTest: Add missing test case for gtest_discover_tests failure 
Discovery timeout test needs split out into two components:
- build
- test

Building the project should result in a failure due to the timeout
when executing gtest discovery as a post build step.

Likewise, if you ran CTest after this build failure,
we should *also* detect that the discovery_timeout_test has not been built
because no discovery_timeout_test[1]_tests.cmake has been created
due to the test discovery failure (caused by the timeout).
 2020-03-11 15:10:23 -05:00
Raul Tambre
f75bea1071 CUDA: Abstract language flag to compiler modules 
Separate this detail out into compiler-specific modules.
Required for Clang support, as it uses slightly different language flags.
 2020-03-11 21:30:09 +02:00
Betsy McPhail
7a1cce210b CTest: Fix our internal CURL_DEBUGFUNCTION to conform to CURL docs 
The curl debug callback function must return ``0``.

Fixes: #20449
 2020-03-11 13:36:58 -04:00
Bo Anderson
1044776472 FindPython: Convert env CMAKE_FRAMEWORK_PATH to CMake path 2020-03-11 13:35:33 -04:00
Bo Anderson
c841d43d70 CMakeFindFrameworks: Search CMAKE_FRAMEWORK_PATH 2020-03-11 12:54:26 -04:00
Marc Chevrier
f964739ead cmCTestRunTest: modernize memory management 2020-03-11 17:46:11 +01:00
Vitaly Stakhovsky
36a5b3d1d1 cmMakefile::AddCacheDefinition: Add overload that accepts std::string value 2020-03-11 09:40:43 -04:00
Brad King
c7c6e103d1 Merge topic 'loops-improve' 
cbbca9ee2a Convert more loops to range-based for-loops
9296cd0551 GHS: Name range-based for-loop variable types explicitly
db17de2438 GHS: Use cm::erase in place of loop

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4446
 2020-03-11 09:27:24 -04:00
Brad King
38072787d5 Merge topic 'std-string-cleanup' 
a6cd48ac41 Source: use std::string overloads

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4453
 2020-03-11 09:26:31 -04:00
Brad King
dd45b7b429 Merge topic 'FindCUDAToolkit-reduce-verbosity' into release-3.17 
a7cf574417 CUDAToolkit: Mark find queries as advanced variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4455
 2020-03-11 08:56:40 -04:00
Brad King
e3571773ce Merge branch 'release-3.17' 2020-03-11 08:56:40 -04:00
Brad King
c22c17eff0 Merge topic 'FindCUDAToolkit-reduce-verbosity' 
a7cf574417 CUDAToolkit: Mark find queries as advanced variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4455
 2020-03-11 08:56:40 -04:00