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

Change all uses of TARGET_LINK_LIBRARIES to use the keyword signature.

Some were already using it and this should be uniform to work properly.
parent 0472eed0
No related branches found
No related tags found
No related merge requests found
......@@ -34,7 +34,7 @@ function(VirtualRobotApplication name srcs incs)
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
################################## EXECUTABLE ##############################
ADD_EXECUTABLE(${name} ${srcs} ${incs})
TARGET_LINK_LIBRARIES(${name} VirtualRobot ${Simox_EXTERNAL_LIBRARIES})
TARGET_LINK_LIBRARIES(${name} PUBLIC VirtualRobot ${Simox_EXTERNAL_LIBRARIES})
endfunction()
......@@ -58,7 +58,7 @@ function(VirtualRobotQtApplication name srcs incs mocFiles uiFiles)
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
################################## EXECUTABLE ##############################
ADD_EXECUTABLE(${name} ${srcs} ${incs} ${generatedUiFiles} ${generatedMocFiles})
TARGET_LINK_LIBRARIES(${name} VirtualRobot ${Simox_EXTERNAL_LIBRARIES})
TARGET_LINK_LIBRARIES(${name} PUBLIC VirtualRobot ${Simox_EXTERNAL_LIBRARIES})
endfunction()
......@@ -89,14 +89,14 @@ endfunction()
function(SimoxApplication name srcs incs)
VirtualRobotApplication("${name}" "${srcs}" "${incs}")
# add Saba and GraspStudio
TARGET_LINK_LIBRARIES(${name} GraspStudio Saba)
TARGET_LINK_LIBRARIES(${name} PUBLIC GraspStudio Saba)
endfunction()
function(SimoxQtApplication name srcs incs mocFiles uiFiles)
VirtualRobotQtApplication("${name}" "${srcs}" "${incs}" "${mocFiles}" "${uiFiles}")
# add Saba and GraspStudio
TARGET_LINK_LIBRARIES(${name} GraspStudio Saba)
TARGET_LINK_LIBRARIES(${name} PUBLIC GraspStudio Saba)
endfunction()
......
......@@ -19,7 +19,7 @@ IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION)
)
VirtualRobotQtApplication(${PROJECT_NAME} "${demo_SRCS}" "${demo_INCS}" "${GUI_MOC_HDRS}" "${GUI_UIS}")
TARGET_LINK_LIBRARIES(${PROJECT_NAME} Saba)
TARGET_LINK_LIBRARIES(${PROJECT_NAME} PRIVATE Saba)
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES FOLDER "Examples")
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_BIN_DIR})
......
......@@ -7,7 +7,7 @@ IF (SimDynamics_USE_BULLET_USE_GLUT)
message("GLUT_INCLUDE_DIR:${GLUT_INCLUDE_DIR}")
# create the executable
SimoxApplication(${PROJECT_NAME} "BulletDebugViewerGlut.cpp" "")
TARGET_LINK_LIBRARIES(${PROJECT_NAME} SimDynamics BulletOpenGLSupport ${Simox_EXTERNAL_LIBRARIES})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} PRIVATE SimDynamics BulletOpenGLSupport ${Simox_EXTERNAL_LIBRARIES})
ELSE(SimDynamics_USE_BULLET_USE_GLUT)
IF(WIN32)
......@@ -18,7 +18,7 @@ ELSE(SimDynamics_USE_BULLET_USE_GLUT)
#"Win32BasicDemo.cpp"
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /subsystem:windows")
SimoxApplication(${PROJECT_NAME} ${SRC} "")
TARGET_LINK_LIBRARIES(${PROJECT_NAME} SimDynamics BulletOpenGLSupport)
TARGET_LINK_LIBRARIES(${PROJECT_NAME} PRIVATE SimDynamics BulletOpenGLSupport)
ELSE(WIN32)
MESSAGE (STATUS " * !GLUT only supported on windows so far... Skipping BulletDebugViewer")
ENDIF(WIN32)
......
......@@ -16,7 +16,7 @@ IF(Simox_USE_COIN_VISUALIZATION)
)
SimoxQtApplication("${PROJECT_NAME}" "${demo_SRCS}" "${demo_INCS}" "${GUI_MOC_HDRS}" "${GUI_UIS}")
TARGET_LINK_LIBRARIES(${PROJECT_NAME} SimDynamics ${Simox_EXTERNAL_LIBRARIES})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} PRIVATE SimDynamics ${Simox_EXTERNAL_LIBRARIES})
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES FOLDER "Examples")
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_BIN_DIR})
......
......@@ -22,7 +22,7 @@ IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION)
VirtualRobotQtApplication(${PROJECT_NAME} "${demo_SRCS}" "${demo_INCS}" "${GUI_MOC_HDRS}" "${GUI_UIS}")
if(WIN32)
TARGET_LINK_LIBRARIES(${PROJECT_NAME} opengl32)
TARGET_LINK_LIBRARIES(${PROJECT_NAME} PRIVATE opengl32)
endif(WIN32)
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_BIN_DIR})
......@@ -33,7 +33,7 @@ IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION)
find_package(OpenGL REQUIRED)
if(OPENGL_FOUND)
include_directories(SYSTEM ${OPENGL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${OPENGL_LIBRARIES})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} PRIVATE ${OPENGL_LIBRARIES})
endif(OPENGL_FOUND)
......
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