Skip to content

Commit

Permalink
Merge pull request #859 from aprokop/update_version
Browse files Browse the repository at this point in the history
  • Loading branch information
aprokop committed May 5, 2023
2 parents 9c3eddf + f283522 commit 5dbc96c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ endif()
cmake_dependent_option(ARBORX_ENABLE_CUDA_AWARE_MPI
"Allow using device data in MPI communication"
OFF "ARBORX_ENABLE_MPI" OFF)
if(ARBORX_USE_CUDA_AWARE_MPI)
if(ARBORX_USE_CUDA_AWARE_MPI)
set(ARBORX_ENABLE_GPU_AWARE_MPI ON)
message(DEPRECATION "ARBORX_USE_CUDA_AWARE_MPI is deprecated, use ARBORX_ENABLE_GPU_AWARE_MPI instead")
endif()
Expand All @@ -67,7 +67,6 @@ cmake_dependent_option(ARBORX_ENABLE_GPU_AWARE_MPI
"Allow using device data in MPI communication"
OFF "ARBORX_ENABLE_MPI" OFF)


target_include_directories(ArborX INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/details>
Expand All @@ -90,7 +89,7 @@ install(EXPORT ArborXTargets
DESTINATION lib/cmake/ArborX
)

set(ARBORX_VERSION_STRING "1.4 (dev)")
set(ARBORX_VERSION_STRING "1.5 (dev)")

# Make sure that the git hash in ArborX_Version.hpp is considered to be always
# out of date, and thus is updated every recompile.
Expand Down
2 changes: 1 addition & 1 deletion examples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
cmake_minimum_required(VERSION 3.16)
project(ArborXExamples CXX)
find_package(ArborX 1.4 REQUIRED)
find_package(ArborX 1.5 REQUIRED)
enable_testing()
endif()

Expand Down

0 comments on commit 5dbc96c

Please sign in to comment.