diff --git a/Code/Gui/CMakeLists.txt b/Code/Gui/CMakeLists.txt index 852d1cc3afb24c7c363f2caa79f52f4e712019e6..d4121a4fbde15fbd41a8bff9f3266933b30d244f 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 d43a587b5da37275884581c32ef35052bb711183..b0fcfa82b72ea1bba40e24fff676e8c11db70a1f 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 9bfc18f098c1e735144c859aea1ff3de4054606e..e4ad96575ca9e38fe0c88448c95a6075b4a3d9e6 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})