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

iox-#1287 Fix CMake install paths #1385

Merged
merged 3 commits into from
Jun 10, 2022
Merged

iox-#1287 Fix CMake install paths #1385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c1ff2d
iox-#1287 Fix DDS gateway install path
mossmaurice Jun 8, 2022
e801e34
iox-#1287 Do setup and install only via iox_add_library and not directly
mossmaurice Jun 8, 2022
9624b70
iox-#1287 Add missing PROJECT_PREFIX
mossmaurice Jun 8, 2022
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 iceoryx_dds/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ iox_add_library(
NO_FIND_PACKAGE_SUPPORT
TARGET iceoryx_dds
NAMESPACE iceoryx_dds
PROJECT_PREFIX ${PREFIX}
BUILD_INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_BINARY_DIR}/dependencies/install/include
INSTALL_INTERFACE include/${PREFIX}
Expand Down
39 changes: 29 additions & 10 deletions iceoryx_posh/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,33 @@ iox_make_unique_includedir()

include(cmake/iceoryxversions.cmake)

########## Multiple libraries are exported, the setup and installation is done
# manually without the iox_* macros
#
########## posh core lib ##########
########## set variables for library export ##########
#
# TODO: iox-#1287 cleanup this, it sets DESTINATION_INCLUDEDIR and
# DESTINATION_CONFIGDIR which are used later in this scope
setup_package_name_and_create_files(
NAME ${PROJECT_NAME}
NAMESPACE iceoryx_posh
PROJECT_PREFIX ${PREFIX}
)

#
########## find_package in source tree ##########
#
set(${PROJECT_NAME}_DIR ${CMAKE_CURRENT_LIST_DIR}/cmake
CACHE FILEPATH
"${PROJECT_NAME}Config.cmake to make find_package(${PROJECT_NAME}) work in source tree!"
FORCE
)

#
########## posh core lib ##########
#
iox_add_library(
NO_EXPORT
NO_PACKAGE_SETUP
NO_FIND_PACKAGE_SUPPORT
TARGET iceoryx_posh # @todo iox-#590 Rename this to iceoryx_posh_core
NAMESPACE iceoryx_posh # @todo iox-#590 Name of iceoryx_posh should stay to be backwards compatible
# and include both iceoryx_posh_core and iceoryx_posh_runtime
Expand Down Expand Up @@ -154,6 +168,7 @@ iox_add_library(
NO_FIND_PACKAGE_SUPPORT
TARGET iceoryx_posh_gateway
NAMESPACE iceoryx_posh
PROJECT_PREFIX ${PREFIX}
BUILD_INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_BINARY_DIR}/generated/iceoryx/include
${CMAKE_BINARY_DIR}/dependencies/install/include
Expand All @@ -173,14 +188,17 @@ iox_add_library(
NO_FIND_PACKAGE_SUPPORT
TARGET iceoryx_posh_roudi
NAMESPACE iceoryx_posh
PUBLIC_LIBS iceoryx_posh::iceoryx_posh
PROJECT_PREFIX ${PREFIX}
PUBLIC_LIBS iceoryx_posh::iceoryx_posh # @todo iox-#590 Only link against iceoryx_posh_core
PRIVATE_LIBS iceoryx_hoofs::iceoryx_hoofs
PRIVATE_INCLUDES source/runtime
source/version
source/popo
source/capro
source/roudi
PRIVATE_LIBS_QNX socket
BUILD_INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include
INSTALL_INTERFACE include/${PREFIX}
FILES
source/roudi/application/iceoryx_roudi_app.cpp
source/roudi/application/roudi_app.cpp
Expand Down Expand Up @@ -214,6 +232,7 @@ if(TOML_CONFIG)
NO_FIND_PACKAGE_SUPPORT
TARGET iceoryx_posh_config
NAMESPACE iceoryx_posh
PROJECT_PREFIX ${PREFIX}
PRIVATE_LIBS iceoryx_posh::iceoryx_posh
iceoryx_hoofs::iceoryx_hoofs
iceoryx_posh::iceoryx_posh_roudi
Expand Down Expand Up @@ -258,11 +277,6 @@ if(TOML_CONFIG)
set(ROUDI_EXPORT iceoryx_posh_config iox-roudi)
endif()

setup_install_directories_and_export_package(
TARGETS iceoryx_posh iceoryx_posh_roudi iceoryx_posh_gateway ${ROUDI_EXPORT}
INCLUDE_DIRECTORY include/
)

configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/iceoryx_posh_deployment.hpp.in"
"${CMAKE_BINARY_DIR}/generated/iceoryx/include/iceoryx_posh/iceoryx_posh_deployment.hpp" @ONLY)

Expand All @@ -273,13 +287,17 @@ install(
)

# install deployment file to make posh config accessible by other packages

install(
FILES
cmake/IceoryxPoshDeployment.cmake
DESTINATION ${DESTINATION_CONFIGDIR}
)

setup_install_directories_and_export_package(
TARGETS iceoryx_posh iceoryx_posh_roudi iceoryx_posh_gateway ${ROUDI_EXPORT}
INCLUDE_DIRECTORY include/
)

if(ROUDI_ENVIRONMENT OR BUILD_TEST)
#
######### posh roudi environment ##########
Expand All @@ -288,6 +306,7 @@ if(ROUDI_ENVIRONMENT OR BUILD_TEST)
STATIC
TARGET iceoryx_posh_testing
NAMESPACE iceoryx_posh_testing
PROJECT_PREFIX ${PREFIX}
BUILD_INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/testing/include
INSTALL_INTERFACE include/${PREFIX}
PRIVATE_LIBS iceoryx_posh::iceoryx_posh
Expand Down