Skip to content
Snippets Groups Projects
Commit 81a198cb authored by Raphael Grimm's avatar Raphael Grimm
Browse files

Use PUBLIC/PRIVATE version of target_link_libraries

parent 1b182dce
No related branches found
No related tags found
No related merge requests found
......@@ -16,7 +16,7 @@ MACRO(ADD_GRASPSTUDIO_TEST TEST_NAME)
ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK)
endif (NOT Boost_USE_STATIC_LIBS)
ADD_EXECUTABLE(${TEST_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.cpp)
TARGET_LINK_LIBRARIES(${TEST_NAME} VirtualRobot Saba GraspStudio ${Simox_EXTERNAL_LIBRARIES})
TARGET_LINK_LIBRARIES(${TEST_NAME} PRIVATE VirtualRobot Saba GraspStudio ${Simox_EXTERNAL_LIBRARIES})
SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_TEST_DIR})
SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES FOLDER "GraspStudio Tests")
ADD_TEST(NAME Saba_${TEST_NAME}
......@@ -98,7 +98,7 @@ ADD_DEFINITIONS(${Simox_EXTERNAL_LIBRARY_FLAGS})
ADD_LIBRARY (GraspStudio SHARED ${SOURCES} ${INCLUDES})
TARGET_LINK_LIBRARIES (GraspStudio Saba VirtualRobot ${Simox_EXTERNAL_LIBRARIES} ${QHULL_LIBRARIES})
TARGET_LINK_LIBRARIES (GraspStudio PUBLIC Saba VirtualRobot ${Simox_EXTERNAL_LIBRARIES} ${QHULL_LIBRARIES})
# .DLL path
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_BIN_DIR})
......
......@@ -23,7 +23,7 @@ MACRO(ADD_SABA_TEST TEST_NAME)
endif (NOT Boost_USE_STATIC_LIBS)
ADD_DEFINITIONS(${Simox_EXTERNAL_LIBRARY_FLAGS})
ADD_EXECUTABLE(${TEST_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.cpp)
TARGET_LINK_LIBRARIES(${TEST_NAME} VirtualRobot Saba ${Simox_EXTERNAL_LIBRARIES} ${Boost_TEST_LIB})
TARGET_LINK_LIBRARIES(${TEST_NAME} PRIVATE VirtualRobot Saba ${Simox_EXTERNAL_LIBRARIES} ${Boost_TEST_LIB})
SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_TEST_DIR})
SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES FOLDER "Saba Tests")
ADD_TEST(NAME Saba_${TEST_NAME}
......@@ -95,7 +95,7 @@ ADD_DEFINITIONS(${Simox_EXTERNAL_LIBRARY_FLAGS})
ADD_LIBRARY (Saba SHARED ${SOURCES} ${INCLUDES})
#MESSAGE(STATUS "VirtualRobot_ROBOT_LINK_LIBRARIES:" ${VirtualRobot_EXTERNAL_LIBRARIES})
TARGET_LINK_LIBRARIES (Saba VirtualRobot ${Simox_EXTERNAL_LIBRARIES})
TARGET_LINK_LIBRARIES (Saba PUBLIC VirtualRobot ${Simox_EXTERNAL_LIBRARIES})
# .DLL path
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_BIN_DIR})
......
......@@ -134,7 +134,7 @@ MACRO(ADD_SIMDYNAMICS_TEST TEST_NAME)
ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK)
endif (NOT Boost_USE_STATIC_LIBS)
ADD_EXECUTABLE(${TEST_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.cpp)
TARGET_LINK_LIBRARIES(${TEST_NAME} VirtualRobot Saba GraspStudio SimDynamics ${Simox_EXTERNAL_LIBRARIES} ${SimDynamics_PHYSICS_LIBRARIES} ${Boost_TEST_LIB})
TARGET_LINK_LIBRARIES(${TEST_NAME} PRIVATE VirtualRobot Saba GraspStudio SimDynamics ${Simox_EXTERNAL_LIBRARIES} ${SimDynamics_PHYSICS_LIBRARIES} ${Boost_TEST_LIB})
SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_TEST_DIR})
SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES FOLDER "SimDynamics Tests")
ADD_TEST(NAME SimDynamics_${TEST_NAME}
......@@ -229,10 +229,10 @@ if (SimDynamics_DYNAMICSENGINE)
ADD_LIBRARY (SimDynamics SHARED ${SOURCES} ${INCLUDES})
if (SimDynamics_BULLET_OpenGL)
TARGET_LINK_LIBRARIES (SimDynamics BulletOpenGLSupport)
TARGET_LINK_LIBRARIES (SimDynamics PUBLIC BulletOpenGLSupport)
SET (SimDynamics_BULLET_OpenGL TRUE PARENT_SCOPE) # inform parent scope about BulletOpenGLSupport
ENDIF(SimDynamics_BULLET_OpenGL)
TARGET_LINK_LIBRARIES (SimDynamics ${Simox_EXTERNAL_LIBRARIES} VirtualRobot ${SimDynamics_PHYSICS_LIBRARIES})
TARGET_LINK_LIBRARIES (SimDynamics PUBLIC ${Simox_EXTERNAL_LIBRARIES} VirtualRobot ${SimDynamics_PHYSICS_LIBRARIES})
# .DLL path
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_BIN_DIR})
......
......@@ -36,7 +36,7 @@ MACRO(ADD_VR_TEST TEST_NAME)
ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK)
endif (NOT Boost_USE_STATIC_LIBS)
ADD_EXECUTABLE(${TEST_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.cpp)
TARGET_LINK_LIBRARIES(${TEST_NAME} VirtualRobot ${Simox_EXTERNAL_LIBRARIES} ${Boost_TEST_LIB})
TARGET_LINK_LIBRARIES(${TEST_NAME} PRIVATE VirtualRobot ${Simox_EXTERNAL_LIBRARIES} ${Boost_TEST_LIB})
SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_TEST_DIR})
SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES FOLDER "VirtualRobot Tests")
ADD_TEST(NAME VirtualRobot_${TEST_NAME}
......
......@@ -31,7 +31,7 @@ if (Boost_FOUND)
# source: https://stackoverflow.com/a/3500721
target_compile_definitions(${PROJECT_NAME} PRIVATE -DBOOST_NO_CXX11_SCOPED_ENUMS)
target_link_libraries(${PROJECT_NAME} ${LIBS})
target_link_libraries(${PROJECT_NAME} PRIVATE ${LIBS})
#######################################################################################
......
......@@ -4,7 +4,7 @@ ADD_EXECUTABLE(${PROJECT_NAME} loadRobot.cpp)
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_BIN_DIR})
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES FOLDER "Examples")
TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot)
TARGET_LINK_LIBRARIES(${PROJECT_NAME} PRIVATE VirtualRobot)
#######################################################################################
......
......@@ -17,7 +17,7 @@ if (tinyxml_library AND URDF_FOUND)
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_BIN_DIR})
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES FOLDER "Examples")
TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot ${URDFDOM_LIBRARIES})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} PRIVATE VirtualRobot ${URDFDOM_LIBRARIES})
#######################################################################################
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment