Skip to content

Added header subdir install capability #444

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

Merged
mpenick merged 1 commit into from
May 23, 2019
+17 −2
Merged

Added header subdir install capability #444

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
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ option(CASS_BUILD_TESTS "Build tests" OFF)
option(CASS_BUILD_UNIT_TESTS "Build unit tests" OFF)
option(CASS_DEBUG_CUSTOM_ALLOC "Debug custom allocator" OFF)
option(CASS_INSTALL_HEADER "Install header file" ON)
option(CASS_INSTALL_HEADER_IN_SUBDIR "Install header file under 'include/cassandra'" OFF)
option(CASS_INSTALL_PKG_CONFIG "Install pkg-config file(s)" ON)
option(CASS_MULTICORE_COMPILATION "Enable multicore compilation" ON)
option(CASS_USE_BOOST_ATOMIC "Use Boost atomics library" OFF)
Expand Down
18 changes: 16 additions & 2 deletions cmake/modules/CppDriver.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,22 +234,36 @@ macro(CassConfigureInstall var_prefix pkg_config_stem)
# Create a binary directory executable and DLLs (windows only)
set(INSTALL_DLL_EXE_DIR "bin")

# Determine the header install dir
if (CASS_INSTALL_HEADER_IN_SUBDIR)
if (CASS_INSTALL_HEADER_SUBDIR_NAME)
# User-specified include sub-dir
set(INSTALL_HEADER_DIR "include/${CASS_INSTALL_HEADER_SUBDIR_NAME}")
else()
# Default subdir location is 'include/cassandra'
set(INSTALL_HEADER_DIR "include/${PROJECT_NAME_STRING}")
endif()
else()
# Default header install location is 'include'
set(INSTALL_HEADER_DIR "include")
endif()

if(${var_prefix}_INSTALL_PKG_CONFIG)
if(NOT WIN32)
find_package(PkgConfig)
if(PKG_CONFIG_FOUND)
set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix ${CMAKE_INSTALL_PREFIX})
set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
set(includedir ${CMAKE_INSTALL_PREFIX}/include)
set(includedir ${CMAKE_INSTALL_PREFIX}/${INSTALL_HEADER_DIR})
set(version ${PROJECT_VERSION_STRING})
endif()
endif()
endif()

# Determine if the header should be installed
if(${var_prefix}_INSTALL_HEADER)
install(FILES ${${var_prefix}_API_HEADER_FILES} DESTINATION "include")
install(FILES ${${var_prefix}_API_HEADER_FILES} DESTINATION ${INSTALL_HEADER_DIR})
endif()

# Install the dynamic/shared library
Expand Down