File fix_private_linking.patch of Package OCE
From 6ef63c7c644672c42f1e295803caa5a613a5f02f Mon Sep 17 00:00:00 2001
From: Martin Siggel <martin.siggel@dlr.de>
Date: Thu, 23 May 2019 17:49:04 +0200
Subject: [PATCH] Fixed private linking
---
CMakeLists.txt | 8 ++++----
adm/cmake/BuildToolkit.cmake | 2 +-
adm/cmake/TKOpenGl/CMakeLists.txt | 9 +++++++++
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36bd629b84..7f71789fab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1136,7 +1136,7 @@ if (OCE_AUTOINSTALL_DEPENDENT_LIBS)
if (OCE_VISU_DEP AND OCE_WITH_GL2PS)
get_filename_component(GL2PS_BIN_DIR ${GL2PS_LIBRARY} PATH)
- get_filename_component(GL2PS_BIN_DIR_DBG ${GL2PS_LIBRARY_DEBUG} PATH)
+ # get_filename_component(GL2PS_BIN_DIR_DBG ${GL2PS_LIBRARY_DEBUG} PATH)
install(FILES ${GL2PS_BIN_DIR_DBG}/${CMAKE_SHARED_LIBRARY_PREFIX}gl2psd.dll DESTINATION ${OCE_INSTALL_BIN_DIR} CONFIGURATIONS Debug OPTIONAL)
install(FILES ${GL2PS_BIN_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}gl2ps.dll DESTINATION ${OCE_INSTALL_BIN_DIR} CONFIGURATIONS Release RelWithDebInfo MinSizeRel OPTIONAL)
install(FILES ${GL2PS_BIN_DIR_DBG}/${CMAKE_STATIC_LIBRARY_PREFIX}gl2psd.${OCE_LIB_EXTENSION} DESTINATION ${OCE_INSTALL_LIB_DIR} CONFIGURATIONS Debug OPTIONAL)
@@ -1149,9 +1149,9 @@ if (OCE_AUTOINSTALL_DEPENDENT_LIBS)
if (OCE_VISU_DEP AND OCE_WITH_FREEIMAGE)
get_filename_component(FREEIMAGE_BIN_DIR ${FREEIMAGE_LIBRARY} PATH)
- get_filename_component(FREEIMAGE_BIN_DIR_DBG ${FREEIMAGE_LIBRARY_DEBUG} PATH)
+ # get_filename_component(FREEIMAGE_BIN_DIR_DBG ${FREEIMAGE_LIBRARY_DEBUG} PATH)
get_filename_component(FREEIMAGEPLUS_BIN_DIR ${FREEIMAGE_LIBRARY} PATH)
- get_filename_component(FREEIMAGEPLUS_BIN_DIR_DBG ${FREEIMAGE_LIBRARY_DEBUG} PATH)
+ # get_filename_component(FREEIMAGEPLUS_BIN_DIR_DBG ${FREEIMAGE_LIBRARY_DEBUG} PATH)
install(FILES ${FREEIMAGE_BIN_DIR_DBG}/${CMAKE_SHARED_LIBRARY_PREFIX}freeimaged.dll DESTINATION ${OCE_INSTALL_BIN_DIR} CONFIGURATIONS Debug OPTIONAL)
install(FILES ${FREEIMAGE_BIN_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}freeimage.dll DESTINATION ${OCE_INSTALL_BIN_DIR} CONFIGURATIONS Release RelWithDebInfo MinSizeRel OPTIONAL)
install(FILES ${FREEIMAGE_BIN_DIR_DBG}/${CMAKE_STATIC_LIBRARY_PREFIX}freeimaged.${OCE_LIB_EXTENSION} DESTINATION ${OCE_INSTALL_LIB_DIR} CONFIGURATIONS Debug OPTIONAL)
@@ -1181,7 +1181,7 @@ if (OCE_AUTOINSTALL_DEPENDENT_LIBS)
if(OCE_MULTITHREAD_LIBRARY STREQUAL "TBB")
IF(NOT DEFINED TBB_BIN_DIR)
get_filename_component(TBB_BIN_DIR ${TBB_LIBRARY} PATH)
- get_filename_component(TBB_BIN_DIR_DBG ${TBB_LIBRARY_DEBUG} PATH)
+ # get_filename_component(TBB_BIN_DIR_DBG ${TBB_LIBRARY_DEBUG} PATH)
ENDIF()
if(NOT OCE_BUILD_SHARED_LIB)
set(tbb_prefix "_static")
diff --git a/adm/cmake/BuildToolkit.cmake b/adm/cmake/BuildToolkit.cmake
index 1b70df9a12..165a63ea0f 100644
--- a/adm/cmake/BuildToolkit.cmake
+++ b/adm/cmake/BuildToolkit.cmake
@@ -244,7 +244,7 @@ endif()
if ( NOT "${TOOLKIT}" STREQUAL "TKernel" )
list(REMOVE_DUPLICATES TOOLKIT_DEPENDS)
endif ( NOT "${TOOLKIT}" STREQUAL "TKernel" )
-target_link_libraries(${TOOLKIT} ${TOOLKIT_DEPENDS} ${TOOLKIT_LIBS} ${WIN32_LIBS})
+target_link_libraries(${TOOLKIT} PUBLIC ${TOOLKIT_DEPENDS} PRIVATE ${TOOLKIT_LIBS} ${WIN32_LIBS})
if(TOOLKIT_LIBS_OPTIMIZED)
foreach(lib ${TOOLKIT_LIBS_OPTIMIZED})
diff --git a/adm/cmake/TKOpenGl/CMakeLists.txt b/adm/cmake/TKOpenGl/CMakeLists.txt
index f355c09c83..dea32fc95b 100644
--- a/adm/cmake/TKOpenGl/CMakeLists.txt
+++ b/adm/cmake/TKOpenGl/CMakeLists.txt
@@ -62,6 +62,15 @@ if(WIN32)
list(APPEND TOOLKIT_LIBS vfw32)
endif()
+
+if (NOT WIN32)
+ if (APPLE AND OCE_OSX_USE_COCOA)
+ list(APPEND TOOLKIT_LIBS /System/Library/Frameworks/Cocoa.framework)
+ else(APPLE AND OCE_OSX_USE_COCOA)
+ list(APPEND TOOLKIT_LIBS ${X11_LIBRARIES})
+ endif(APPLE AND OCE_OSX_USE_COCOA)
+endif(NOT WIN32)
+
include(../BuildToolkit.cmake)
if(BORLAND AND BORLAND_VERSION_RS_XE2)
--
2.12.2
