Skip to content

Commit

Permalink
Merge pull request #1188 from aprokop/change_cmake_requirement
Browse files Browse the repository at this point in the history
  • Loading branch information
aprokop authored Jan 5, 2025
2 parents e8d2517 + 702140c commit ad8bb0e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,8 @@ jobs:
run: |
mkdir build
cd build
cmake -D CMAKE_INSTALL_PREFIX=C:\kokkos-install \
-D Kokkos_ENABLE_THREADS=ON \
..
cmake --build . --target install -- -m
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreadedDebugDLL" -DCMAKE_INSTALL_PREFIX=C:\kokkos-install -DKokkos_ENABLE_THREADS=ON ..
cmake --build . --config Release --target install -- -m
- name: Configure ArborX
run: |
mkdir build
Expand All @@ -44,5 +42,5 @@ jobs:
- name: Build ArborX
shell: bash
run: |
cmake --build build --target install -- -m
cmake --build build --config Debug --target install -- -m
cd build
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.22)
project(ArborX CXX)

if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.30.0)
message(STATUS "Setting policy CMP0167 to use FindBoost module")
cmake_policy(SET CMP0167 OLD)
cmake_policy(SET CMP0167 NEW)
endif()

# use gnu standard install directories
Expand Down Expand Up @@ -137,7 +137,7 @@ configure_package_config_file(cmake/ArborXConfig.cmake.in
)
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/ArborXConfigVersion.cmake
VERSION ${ARBORX_VERSION_STRING}
COMPATIBILITY AnyNewerVersion
COMPATIBILITY SameMajorVersion
)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/ArborXConfig.cmake
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN KEYDUMP_URL=https://cloud1.cees.ornl.gov/download && \

# Install CMake
ENV CMAKE_DIR=/opt/cmake
RUN CMAKE_VERSION=3.16.9 && \
RUN CMAKE_VERSION=3.22.6 && \
CMAKE_KEY=2D2CEF1034921684 && \
CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION} && \
CMAKE_SCRIPT=cmake-${CMAKE_VERSION}-Linux-x86_64.sh && \
Expand Down
2 changes: 1 addition & 1 deletion examples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.22)
project(ArborXExamples CXX)
find_package(ArborX 2.0 REQUIRED)
enable_testing()
Expand Down

0 comments on commit ad8bb0e

Please sign in to comment.