Skip to content
Snippets Groups Projects
Unverified Commit 7e2fb92c authored by Florent Lamiraux's avatar Florent Lamiraux Committed by GitHub
Browse files

Merge pull request #145 from nim65s/devel

[CMake] use keyword link libraries
parents f1efbbb5 640b23bb
No related branches found
No related tags found
Loading
......@@ -22,6 +22,7 @@ SET(PROJECT_DESCRIPTION "Corba server for gepetto-viewer")
SET(PROJECT_URL "https://github.com/Gepetto/${PROJECT_NAME}")
SET(PROJECT_USE_CMAKE_EXPORT TRUE)
SET(PROJECT_USE_KEYWORD_LINK_LIBRARIES TRUE)
SET(CXX_DISABLE_WERROR true)
INCLUDE(cmake/base.cmake)
......
......@@ -19,7 +19,7 @@ SET(LIBRARY_NAME ${PROJECT_NAME})
MACRO(ADD_EXAMPLE NAME SOURCE)
ADD_EXECUTABLE (${NAME} ${SOURCE})
TARGET_LINK_LIBRARIES(${NAME} ${LIBRARY_NAME})
TARGET_LINK_LIBRARIES(${NAME} PRIVATE ${LIBRARY_NAME})
PKG_CONFIG_USE_DEPENDENCY(${NAME} omniORB4)
ENDMACRO()
......
......@@ -119,10 +119,10 @@ TARGET_INCLUDE_DIRECTORIES(${LIBRARY_NAME} PRIVATE ${CMAKE_BINARY_DIR}/src)
ADD_DEPENDENCIES (${LIBRARY_NAME} generate_idl_cpp)
ADD_DEPENDENCIES (${LIBRARY_NAME} generate_idl_python)
IF(NOT CLIENT_ONLY)
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} gepetto-viewer::gepetto-viewer)
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} PUBLIC gepetto-viewer::gepetto-viewer)
ENDIF(NOT CLIENT_ONLY)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} omniORB4)
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${QT_LIBRARIES})
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} PUBLIC ${QT_LIBRARIES})
INSTALL(TARGETS ${PROJECT_NAME} EXPORT ${TARGETS_EXPORT_NAME} DESTINATION lib)
......
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