Skip to content

Commit ad8bb0e

Browse files
authored
Merge pull request #1188 from aprokop/change_cmake_requirement
2 parents e8d2517 + 702140c commit ad8bb0e

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

.github/workflows/windows.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,8 @@ jobs:
3232
run: |
3333
mkdir build
3434
cd build
35-
cmake -D CMAKE_INSTALL_PREFIX=C:\kokkos-install \
36-
-D Kokkos_ENABLE_THREADS=ON \
37-
..
38-
cmake --build . --target install -- -m
35+
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreadedDebugDLL" -DCMAKE_INSTALL_PREFIX=C:\kokkos-install -DKokkos_ENABLE_THREADS=ON ..
36+
cmake --build . --config Release --target install -- -m
3937
- name: Configure ArborX
4038
run: |
4139
mkdir build
@@ -44,5 +42,5 @@ jobs:
4442
- name: Build ArborX
4543
shell: bash
4644
run: |
47-
cmake --build build --target install -- -m
45+
cmake --build build --config Debug --target install -- -m
4846
cd build

CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
cmake_minimum_required(VERSION 3.16)
1+
cmake_minimum_required(VERSION 3.22)
22
project(ArborX CXX)
33

44
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.30.0)
55
message(STATUS "Setting policy CMP0167 to use FindBoost module")
6-
cmake_policy(SET CMP0167 OLD)
6+
cmake_policy(SET CMP0167 NEW)
77
endif()
88

99
# use gnu standard install directories
@@ -137,7 +137,7 @@ configure_package_config_file(cmake/ArborXConfig.cmake.in
137137
)
138138
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/ArborXConfigVersion.cmake
139139
VERSION ${ARBORX_VERSION_STRING}
140-
COMPATIBILITY AnyNewerVersion
140+
COMPATIBILITY SameMajorVersion
141141
)
142142
install(FILES
143143
${CMAKE_CURRENT_BINARY_DIR}/ArborXConfig.cmake

docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN KEYDUMP_URL=https://cloud1.cees.ornl.gov/download && \
3535

3636
# Install CMake
3737
ENV CMAKE_DIR=/opt/cmake
38-
RUN CMAKE_VERSION=3.16.9 && \
38+
RUN CMAKE_VERSION=3.22.6 && \
3939
CMAKE_KEY=2D2CEF1034921684 && \
4040
CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION} && \
4141
CMAKE_SCRIPT=cmake-${CMAKE_VERSION}-Linux-x86_64.sh && \

examples/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
2-
cmake_minimum_required(VERSION 3.16)
2+
cmake_minimum_required(VERSION 3.22)
33
project(ArborXExamples CXX)
44
find_package(ArborX 2.0 REQUIRED)
55
enable_testing()

0 commit comments

Comments
 (0)