Skip to content

Commit

Permalink
Set the test dll runtime output to CATKIN_PACKAGE_BIN_DESTINATION to …
Browse files Browse the repository at this point in the history
…match default
  • Loading branch information
johnsonshih committed Sep 14, 2018
1 parent 1879df7 commit 7c2cd4a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ add_library(${PROJECT_NAME}_TestPlugins1 EXCLUDE_FROM_ALL plugins1.cpp)
target_link_libraries(${PROJECT_NAME}_TestPlugins1 ${PROJECT_NAME})
if(WIN32)
# On Windows, default library runtime output set to CATKIN_GLOBAL_BIN_DESTINATION,
# change it back to CATKIN_PACKAGE_LIB_DESTINATION so the test can run correctly
# change it back to CATKIN_PACKAGE_BIN_DESTINATION so the test can run correctly
set_target_properties(${PROJECT_NAME}_TestPlugins1 PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION})
RUNTIME_OUTPUT_DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_BIN_DESTINATION})
endif()
class_loader_hide_library_symbols(${PROJECT_NAME}_TestPlugins1)
add_library(${PROJECT_NAME}_TestPlugins2 EXCLUDE_FROM_ALL plugins2.cpp)
target_link_libraries(${PROJECT_NAME}_TestPlugins2 ${PROJECT_NAME})
if(WIN32)
# On Windows, default library runtime output set to CATKIN_GLOBAL_BIN_DESTINATION,
# change it back to CATKIN_PACKAGE_LIB_DESTINATION so the test can run correctly
# change it back to CATKIN_PACKAGE_BIN_DESTINATION so the test can run correctly
set_target_properties(${PROJECT_NAME}_TestPlugins2 PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION})
RUNTIME_OUTPUT_DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_BIN_DESTINATION})
endif()
class_loader_hide_library_symbols(${PROJECT_NAME}_TestPlugins2)

Expand Down

0 comments on commit 7c2cd4a

Please sign in to comment.