Skip to content

Commit

Permalink
Fix wrong cmake variable name (#117)
Browse files Browse the repository at this point in the history
Signed-off-by: Ricardo González <[email protected]>
  • Loading branch information
richiware authored Nov 29, 2021
1 parent f986b01 commit f09f201
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ endif()
# Generate different target names depending on linking
get_target_property(TARGET_TYPE ${PROJECT_NAME} TYPE)
if(TARGET_TYPE STREQUAL "SHARED_LIBRARY")
set(FASTDDS_LINKING dynamic)
set(FASTCDR_LINKING dynamic)
else()
set(FASTDDS_LINKING static)
set(FASTCDR_LINKING static)
endif()

if(MSVC OR MSVC_IDE AND EPROSIMA_INSTALLER)
Expand All @@ -159,22 +159,22 @@ if(MSVC OR MSVC_IDE AND EPROSIMA_INSTALLER)
)
elseif(NOT EPROSIMA_INSTALLER)
install(TARGETS ${PROJECT_NAME}
EXPORT ${PROJECT_NAME}-${FASTDDS_LINKING}-targets
EXPORT ${PROJECT_NAME}-${FASTCDR_LINKING}-targets
RUNTIME DESTINATION ${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}
LIBRARY DESTINATION ${LIB_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}
COMPONENT libraries${MSVCARCH_EXTENSION}
)

export(TARGETS ${PROJECT_NAME} FILE ${PROJECT_BINARY_DIR}/cmake/config/${PROJECT_NAME}-${FASTDDS_LINKING}-targets.cmake)
export(TARGETS ${PROJECT_NAME} FILE ${PROJECT_BINARY_DIR}/cmake/config/${PROJECT_NAME}-${FASTCDR_LINKING}-targets.cmake)

if(INSTALLER_PLATFORM)
set(INSTALL_DESTINATION_PATH ${DATA_INSTALL_DIR}/${PROJECT_NAME}-${INSTALLER_PLATFORM}/cmake)
else()
set(INSTALL_DESTINATION_PATH ${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}${MSVCARCH_DIR_EXTENSION_EXT})
endif()

install(EXPORT ${PROJECT_NAME}-${FASTDDS_LINKING}-targets
install(EXPORT ${PROJECT_NAME}-${FASTCDR_LINKING}-targets
DESTINATION ${INSTALL_DESTINATION_PATH}
COMPONENT cmake
)
Expand Down

0 comments on commit f09f201

Please sign in to comment.