From 873306a40bc33e7bf9da0f68a30317ed2fc2d149 Mon Sep 17 00:00:00 2001
From: Thomas Feuvrier <thomas.feuvrier@c-s.fr>
Date: Wed, 1 Oct 2008 18:18:57 +0200
Subject: [PATCH] COMP: cmake correction for Mac OS X to suppress cmake warning
(POLICY NEW conform)
---
CMakeLists.txt | 2 +-
Code/Gui/CMakeLists.txt | 2 +-
Utilities/FLTK/fluid/CMakeLists.txt | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 446765a35f..2877087960 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -514,7 +514,7 @@ ENDIF(WIN32)
IF(OTB_USE_VISU_GUI)
SET(OTB_VISU_GUI_LIBRARIES "${FLTK_LIBRARIES};${OPENGL_LIBRARIES};${FLTK_PLATFORM_DEPENDENT_LIBS}")
IF(APPLE)
- SET(OTB_VISU_GUI_LIBRARIES "${OTB_VISU_GUI_LIBRARIES} -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib ")
+ SET(OTB_VISU_GUI_LIBRARIES "${OTB_VISU_GUI_LIBRARIES};-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
ENDIF(APPLE)
ELSE(OTB_USE_VISU_GUI)
SET(OTB_VISU_GUI_LIBRARIES "")
diff --git a/Code/Gui/CMakeLists.txt b/Code/Gui/CMakeLists.txt
index 6f608142ca..05efe68a95 100644
--- a/Code/Gui/CMakeLists.txt
+++ b/Code/Gui/CMakeLists.txt
@@ -6,7 +6,7 @@ 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")
+ 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)
diff --git a/Utilities/FLTK/fluid/CMakeLists.txt b/Utilities/FLTK/fluid/CMakeLists.txt
index 5cc1f0bfe2..c06a0a3915 100644
--- a/Utilities/FLTK/fluid/CMakeLists.txt
+++ b/Utilities/FLTK/fluid/CMakeLists.txt
@@ -27,8 +27,8 @@ INSTALL_TARGETS(/bin fluid)
TARGET_LINK_LIBRARIES(fluid ${OTB_VISU_GUI_LIBRARIES} ${FLTK_PLATFORM_DEPENDENT_LIBS})
IF(OPENGL_FOUND)
TARGET_LINK_LIBRARIES(fluid fltk_gl)
- IF(APPLE)
- TARGET_LINK_LIBRARIES(fluid -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib)
- ENDIF(APPLE)
+# IF(APPLE)
+# TARGET_LINK_LIBRARIES(fluid -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib)
+# ENDIF(APPLE)
ENDIF(OPENGL_FOUND)
--
GitLab