diff options
| -rw-r--r-- | .gitlab/os-linux.yml | 31 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 | ||||
| -rw-r--r-- | Source/CursesDialog/form/form.h | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/FindBoost/CommonNotFound.cmake | 4 |
4 files changed, 18 insertions, 22 deletions
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index cf671ef..8f547cb 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -269,76 +269,65 @@ ### CUDA builds -.cuda9.2: - image: "kitware/cmake:ci-cuda9.2-x86_64-2021-10-01" - +.cuda: variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" - CMAKE_ARCH: x86_64 CTEST_LABELS: "CUDA" CMAKE_CUDA_ARCHITECTURES_NATIVE_CLAMP: 1 +.cuda9.2: + extends: .cuda + image: "kitware/cmake:ci-cuda9.2-x86_64-2021-10-01" + variables: + CMAKE_ARCH: x86_64 + .cuda9.2_nvidia: extends: .cuda9.2 - variables: CMAKE_CONFIGURATION: cuda9.2_nvidia CMAKE_GENERATOR: "Ninja Multi-Config" .cuda10.2: + extends: .cuda image: "kitware/cmake:ci-cuda10.2-x86_64-2021-06-16" - variables: - GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" CMAKE_ARCH: x86_64 - CTEST_LABELS: "CUDA" - CMAKE_CUDA_ARCHITECTURES_NATIVE_CLAMP: 1 .cuda10.2_nvidia: extends: .cuda10.2 - variables: CMAKE_CONFIGURATION: cuda10.2_nvidia CTEST_NO_WARNINGS_ALLOWED: 1 .cuda10.2_clang: extends: .cuda10.2 - variables: CMAKE_CONFIGURATION: cuda10.2_clang CTEST_NO_WARNINGS_ALLOWED: 1 .cuda11.6: + extends: .cuda image: "kitware/cmake:ci-cuda11.6-x86_64-2022-02-28" - variables: - GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" CMAKE_ARCH: x86_64 - CTEST_LABELS: "CUDA" - CMAKE_CUDA_ARCHITECTURES_NATIVE_CLAMP: 1 .cuda11.6_nvidia: extends: .cuda11.6 - variables: CMAKE_CONFIGURATION: cuda11.6_nvidia CTEST_NO_WARNINGS_ALLOWED: 1 .cuda11.6_clang: extends: .cuda11.6 - variables: CMAKE_CONFIGURATION: cuda11.6_clang CTEST_NO_WARNINGS_ALLOWED: 1 .cuda11.8_minimal: + extends: .cuda image: "kitware/cmake:ci-cuda11.8-minimal-x86_64-2022-12-06" - variables: - GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" CMAKE_ARCH: x86_64 - CTEST_LABELS: "CUDA" - CMAKE_CUDA_ARCHITECTURES_NATIVE_CLAMP: 1 .cuda11.8_minimal_nvidia: extends: .cuda11.8_minimal diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index f74a79f..a4955c9 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 25) -set(CMake_VERSION_PATCH 20221207) +set(CMake_VERSION_PATCH 20221208) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) diff --git a/Source/CursesDialog/form/form.h b/Source/CursesDialog/form/form.h index 39ed75a..b590c97 100644 --- a/Source/CursesDialog/form/form.h +++ b/Source/CursesDialog/form/form.h @@ -54,6 +54,9 @@ # if defined(__hpux) && !defined(HAVE__XOPEN_SOURCE_EXTENDED) # undef _XOPEN_SOURCE_EXTENDED # endif + /* Some curses/term headers define lower-case macros that + conflict with our source code. Undefine them. */ +# undef newline # endif #include <eti.h> diff --git a/Tests/RunCMake/FindBoost/CommonNotFound.cmake b/Tests/RunCMake/FindBoost/CommonNotFound.cmake index 864a549..b146d3d 100644 --- a/Tests/RunCMake/FindBoost/CommonNotFound.cmake +++ b/Tests/RunCMake/FindBoost/CommonNotFound.cmake @@ -1,2 +1,6 @@ +set(CMAKE_FIND_USE_CMAKE_PATH OFF) +set(CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH OFF) +set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH OFF) +set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH OFF) # Make sure to use the module mode signature here to not bypass FindBoost find_package(Boost 1.80 COMPONENTS timer foobar) |