Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cmake: Add missing dependency checks in package config #94

Merged
merged 1 commit into from
Feb 8, 2020
Merged

cmake: Add missing dependency checks in package config #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cmake/stdgpu-config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@PACKAGE_INIT@

include("${CMAKE_CURRENT_LIST_DIR}/stdgpu-dependencies.cmake")

include("${CMAKE_CURRENT_LIST_DIR}/stdgpu-targets.cmake")

set_and_check(stdgpu_INCLUDE_DIRS "@PACKAGE_STDGPU_INCLUDE_INSTALL_DIR@")
Expand Down
4 changes: 4 additions & 0 deletions cmake/stdgpu-dependencies.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
include(CMakeFindDependencyMacro)

@STDGPU_DEPENDENCIES_INIT@
@STDGPU_DEPENDENCIES_BACKEND_INIT@
39 changes: 28 additions & 11 deletions src/stdgpu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@

find_package(thrust 1.9.3 REQUIRED)
set(STDGPU_INCLUDE_LOCAL_DIR "${CMAKE_CURRENT_LIST_DIR}/..")
set(STDGPU_BUILD_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/include")
set(STDGPU_BUILD_CMAKE_DIR "${CMAKE_CURRENT_BINARY_DIR}/cmake")

# Setup dependencies
find_package(thrust 1.9.3 REQUIRED MODULE)

set(STDGPU_DEPENDENCIES_INIT "
list(PREPEND CMAKE_MODULE_PATH \${CMAKE_CURRENT_LIST_DIR})
find_dependency(thrust 1.9.3 REQUIRED MODULE)
list(POP_FRONT CMAKE_MODULE_PATH)
")


# Setup library options and config file
if(${CMAKE_BUILD_TYPE} MATCHES "Release" OR ${CMAKE_BUILD_TYPE} MATCHES "MinSizeRel")
set(STDGPU_ENABLE_CONTRACT_CHECKS_DEFAULT OFF)
else()
Expand All @@ -15,11 +27,8 @@ option(STDGPU_USE_32_BIT_INDEX "Use 32-bit instead of 64-bit signed integer for
option(STDGPU_USE_FAST_DESTROY "Use fast destruction of allocated arrays (filled with a default value) by omitting destructor calls in memory API, default: OFF" OFF)
option(STDGPU_USE_FIBONACCI_HASHING "Use Fibonacci Hashing instead of Modulo to compute hash bucket indices, default: ON" ON)

set(STDGPU_INCLUDE_LOCAL_DIR "${CMAKE_CURRENT_LIST_DIR}/..")
set(STDGPU_CONFIG_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/include")

configure_file("${STDGPU_INCLUDE_LOCAL_DIR}/stdgpu/config.h.in"
"${STDGPU_CONFIG_BUILD_DIR}/stdgpu/config.h")
"${STDGPU_BUILD_INCLUDE_DIR}/stdgpu/config.h")


if(STDGPU_BUILD_SHARED_LIBS)
Expand All @@ -34,7 +43,7 @@ target_sources(stdgpu PRIVATE impl/iterator.cpp

target_include_directories(stdgpu PUBLIC
$<BUILD_INTERFACE:${STDGPU_INCLUDE_LOCAL_DIR}>
$<BUILD_INTERFACE:${STDGPU_CONFIG_BUILD_DIR}>
$<BUILD_INTERFACE:${STDGPU_BUILD_INCLUDE_DIR}>
$<INSTALL_INTERFACE:${STDGPU_INCLUDE_INSTALL_DIR}>)

target_compile_features(stdgpu PUBLIC cxx_std_14)
Expand All @@ -53,14 +62,22 @@ install(TARGETS stdgpu
DESTINATION "${CMAKE_INSTALL_PREFIX}/${STDGPU_LIB_INSTALL_DIR}"
COMPONENT stdgpu)

install(DIRECTORY "${STDGPU_CONFIG_BUILD_DIR}/"
DESTINATION ${CMAKE_INSTALL_PREFIX}/${STDGPU_INCLUDE_INSTALL_DIR}
COMPONENT stdgpu)

install(DIRECTORY "${STDGPU_INCLUDE_LOCAL_DIR}/"
install(DIRECTORY "${STDGPU_INCLUDE_LOCAL_DIR}/" "${STDGPU_BUILD_INCLUDE_DIR}/"
DESTINATION ${CMAKE_INSTALL_PREFIX}/${STDGPU_INCLUDE_INSTALL_DIR}
COMPONENT stdgpu
FILES_MATCHING
PATTERN "*.h"
PATTERN "*.cuh"
PATTERN "*_fwd")

# Install dependencies file and custom thrust module
configure_file("${stdgpu_SOURCE_DIR}/cmake/stdgpu-dependencies.cmake.in"
"${STDGPU_BUILD_CMAKE_DIR}/stdgpu-dependencies.cmake")

install(FILES "${STDGPU_BUILD_CMAKE_DIR}/stdgpu-dependencies.cmake"
DESTINATION "${CMAKE_INSTALL_PREFIX}/${STDGPU_CMAKE_INSTALL_DIR}"
COMPONENT stdgpu)

install(FILES "${stdgpu_SOURCE_DIR}/cmake/Findthrust.cmake"
DESTINATION "${CMAKE_INSTALL_PREFIX}/${STDGPU_CMAKE_INSTALL_DIR}"
COMPONENT stdgpu)
3 changes: 3 additions & 0 deletions src/stdgpu/cuda/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@

set(STDGPU_DEPENDENCIES_BACKEND_INIT "
" PARENT_SCOPE)

target_sources(stdgpu PRIVATE impl/memory.cpp
impl/bitset.cu
impl/mutex.cu)
Expand Down
4 changes: 4 additions & 0 deletions src/stdgpu/openmp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@

find_package(OpenMP 2.0 REQUIRED)

set(STDGPU_DEPENDENCIES_BACKEND_INIT "
find_dependency(OpenMP 2.0 REQUIRED)
" PARENT_SCOPE)

target_sources(stdgpu PRIVATE impl/memory.cpp
impl/bitset.cpp
impl/mutex.cpp)
Expand Down