diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-27 12:20:48 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-27 12:20:54 (GMT) |
| commit | 8d6a0b9364581fbb95746c93cac4ec3c213f534b (patch) | |
| tree | 062ecacc9474b272fafe3efeb5069730ca6e0d58 /Tests | |
| parent | 698851cdb7e49c2705898a71b2eaf96ca70b9ad5 (diff) | |
| parent | dd77dec18d66a2e20480d9bf2ab06231765720a4 (diff) | |
| download | CMake-8d6a0b9364581fbb95746c93cac4ec3c213f534b.zip CMake-8d6a0b9364581fbb95746c93cac4ec3c213f534b.tar.gz CMake-8d6a0b9364581fbb95746c93cac4ec3c213f534b.tar.bz2 | |
Merge topic 'cuda_vs_skip_computation' into release-3.19
dd77dec18d VS: Don't compute CUDA options unless necessary
e9109dec36 Merge branch 'ninja-multi-per-config-sources' into release-3.18
7c0de4175b Merge branch 'cmake-E-cat-binary' into release-3.18
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5422
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CMP0104/CMP0104-Common.cmake | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/CMP0104/main.cxx | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Tests/RunCMake/CMP0104/CMP0104-Common.cmake b/Tests/RunCMake/CMP0104/CMP0104-Common.cmake index b3568f1..ca4c1aa2 100644 --- a/Tests/RunCMake/CMP0104/CMP0104-Common.cmake +++ b/Tests/RunCMake/CMP0104/CMP0104-Common.cmake @@ -1,2 +1,6 @@ +# Make sure CMP0104 isn't issued for CXX targets created prior to enabling CUDA. See #21341. +enable_language(CXX) +add_library(cxx main.cxx) + enable_language(CUDA) add_library(cuda main.cu) diff --git a/Tests/RunCMake/CMP0104/main.cxx b/Tests/RunCMake/CMP0104/main.cxx new file mode 100644 index 0000000..5047a34 --- /dev/null +++ b/Tests/RunCMake/CMP0104/main.cxx @@ -0,0 +1,3 @@ +int main() +{ +} |