Skip to content

Commit

Permalink
CMake: Only install public headers
Browse files Browse the repository at this point in the history
Eventually internal headers should be moved to src/, but this might
cause difficult-to-resolve merge conflicts at the moment.
  • Loading branch information
fknorr committed Nov 25, 2024
1 parent 825c7fc commit 24f4606
Showing 1 changed file with 42 additions and 6 deletions.
48 changes: 42 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -206,15 +206,51 @@ set(CELERITY_FEATURE_SIMPLE_SCALAR_REDUCTIONS ON)
set(CELERITY_FEATURE_LOCAL_ACCESSOR ON)
set(CELERITY_FEATURE_UNNAMED_KERNELS ON)

# Add includes to library so they show up in IDEs
file(GLOB_RECURSE INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
# Add header files to library so they show up in IDEs
file(GLOB_RECURSE ALL_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")

if(CMAKE_GENERATOR STREQUAL "Ninja")
# Force colored warnings in Ninja's output, if the compiler has -fdiagnostics-color support.
# Rationale in https://github.com/ninja-build/ninja/issues/814
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always")
endif()

# TODO move all non-public headers from "include" to "src"
set(PUBLIC_HEADERS
include/access_modes.h
include/accessor.h
include/buffer.h
include/celerity.h
include/cgf_diagnostics.h
include/cgf.h
include/closure_hydrator.h
include/config.h
include/debug.h
include/device.h
include/distr_queue.h
include/fence.h
include/grid.h
include/handler.h
include/hint.h
include/host_object.h
include/host_utils.h
include/item.h
include/log.h
include/partition.h
include/print_utils.h
include/queue.h
include/range_mapper.h
include/ranges.h
include/reduction.h
include/runtime.h
include/side_effect.h
include/sycl_wrappers.h
include/tracy.h
include/types.h
include/utils.h
include/workaround.h
)

set(SOURCES
src/affinity.cc
src/config.cc
Expand Down Expand Up @@ -267,13 +303,14 @@ elseif(CELERITY_SYCL_IMPL STREQUAL "SimSYCL")
endif()

configure_file(include/version.h.in include/version.h @ONLY)
list(APPEND INCLUDES "${CMAKE_CURRENT_BINARY_DIR}/include/version.h")
list(APPEND ALL_HEADERS "${CMAKE_CURRENT_BINARY_DIR}/include/version.h")
list(APPEND PUBLIC_HEADERS "${CMAKE_CURRENT_BINARY_DIR}/include/version.h")

add_library(
celerity_runtime
STATIC
${SOURCES}
${INCLUDES}
${ALL_HEADERS}
)

set_property(TARGET celerity_runtime PROPERTY CXX_STANDARD "${CELERITY_CXX_STANDARD}")
Expand Down Expand Up @@ -393,9 +430,8 @@ include(CMakePackageConfigHelpers)

# Install celerity
install(
DIRECTORY ${PROJECT_SOURCE_DIR}/include/
FILES ${PUBLIC_HEADERS}
DESTINATION include/celerity
PATTERN *.in EXCLUDE
)
install(
DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/
Expand Down

0 comments on commit 24f4606

Please sign in to comment.