From 8be02dd4b14da6adafedf9420546d1fe163c8dc2 Mon Sep 17 00:00:00 2001
From: Cyrille Valladeau <cyrille.valladeau@c-s.fr>
Date: Tue, 24 Nov 2009 17:46:58 +0100
Subject: [PATCH] BUG: Fixing wrong linker flag on macosx shared
---
Code/Gui/CMakeLists.txt | 9 ---------
Code/Visu/CMakeLists.txt | 7 -------
Code/Visualization/CMakeLists.txt | 7 -------
3 files changed, 23 deletions(-)
diff --git a/Code/Gui/CMakeLists.txt b/Code/Gui/CMakeLists.txt
index 852d1cc3af..d4121a4fbd 100644
--- a/Code/Gui/CMakeLists.txt
+++ b/Code/Gui/CMakeLists.txt
@@ -2,15 +2,6 @@
FILE(GLOB OTBGui_SRCS "*.cxx" )
-
-# To suppress "ld: cycle in dylib re-exports with /usr/X11R6/lib/libGL.dylib" error on APPLE and SHARED configuration
-IF(APPLE AND BUILD_SHARED_LIBS)
- FOREACH(c "" "_DEBUG" "_RELEASE" "_MINSIZEREL" "_RELWITHDEBINFO")
- SET(CMAKE_SHARED_LINKER_FLAGS${c} "${CMAKE_SHARED_LINKER_FLAGS${c}};-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
- ENDFOREACH(c)
-ENDIF(APPLE AND BUILD_SHARED_LIBS)
-
-
ADD_LIBRARY(OTBGui ${OTBGui_SRCS})
TARGET_LINK_LIBRARIES (OTBGui OTBCommon ${OTB_VISU_GUI_LIBRARIES})
IF(OTB_LIBRARY_PROPERTIES)
diff --git a/Code/Visu/CMakeLists.txt b/Code/Visu/CMakeLists.txt
index d43a587b5d..b0fcfa82b7 100644
--- a/Code/Visu/CMakeLists.txt
+++ b/Code/Visu/CMakeLists.txt
@@ -2,13 +2,6 @@
FILE(GLOB OTBVisu_SRCS "*.cxx" )
-# To suppress "ld: cycle in dylib re-exports with /usr/X11R6/lib/libGL.dylib" error on APPLE and SHARED configuration
-IF(APPLE AND BUILD_SHARED_LIBS)
- FOREACH(c "" "_DEBUG" "_RELEASE" "_MINSIZEREL" "_RELWITHDEBINFO")
- SET(CMAKE_SHARED_LINKER_FLAGS${c} "${CMAKE_SHARED_LINKER_FLAGS${c}} -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
- ENDFOREACH(c)
-ENDIF(APPLE AND BUILD_SHARED_LIBS)
-
ADD_LIBRARY(OTBVisu ${OTBVisu_SRCS})
TARGET_LINK_LIBRARIES (OTBVisu OTBGui OTBCommon ${OTB_VISU_GUI_LIBRARIES})
IF(OTB_LIBRARY_PROPERTIES)
diff --git a/Code/Visualization/CMakeLists.txt b/Code/Visualization/CMakeLists.txt
index 9bfc18f098..e4ad96575c 100644
--- a/Code/Visualization/CMakeLists.txt
+++ b/Code/Visualization/CMakeLists.txt
@@ -2,13 +2,6 @@
FILE(GLOB OTBVisualization_SRCS "*.cxx" )
-# To suppress "ld: cycle in dylib re-exports with /usr/X11R6/lib/libGL.dylib" error on APPLE and SHARED configuration
-IF(APPLE AND BUILD_SHARED_LIBS)
- FOREACH(c "" "_DEBUG" "_RELEASE" "_MINSIZEREL" "_RELWITHDEBINFO")
- SET(CMAKE_SHARED_LINKER_FLAGS${c} "${CMAKE_SHARED_LINKER_FLAGS${c}} -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
- ENDFOREACH(c)
-ENDIF(APPLE AND BUILD_SHARED_LIBS)
-
FLTK_WRAP_UI(OTBVisualization otbImageWidgetPackedManager.fl otbImageWidgetSplittedManager.fl)
ADD_LIBRARY(OTBVisualization ${OTBVisualization_SRCS} ${OTBVisualization_FLTK_UI_SRCS})
--
GitLab