X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FCMakeLists.txt;h=e5e20f97d30f5a5799d8c2e2fef961192e01db77;hb=b14e05d38fa7c7093a22673adebce86b97d69fa0;hp=19511db659764f71797884a3cf25488169b21a09;hpb=2b5b3e906ee95519169e9b6d4bb2da9d2e00d8b3;p=clitk.git

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index 19511db..e5e20f9 100644
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -107,6 +107,8 @@ SET(vv_SRCS
 #=========================================================
 # Qt related commands
 FIND_PACKAGE(Qt4 REQUIRED)
+LINK_DIRECTORIES(${QT_LIBRARY_DIR})
+
 
 QT4_WRAP_CPP(vv_SRCS 
   vvMainWindowBase.h 
@@ -195,8 +197,6 @@ INCLUDE_DIRECTORIES(
   ../segmentation
   )
 
-LINK_DIRECTORIES(${QT_LIBRARY_DIR})
-
 #=========================================================
 #Add each tool's dependencies
 foreach(tool ${vv_TOOLS})
@@ -218,9 +218,25 @@ IF(CLITK_EXPERIMENTAL)
 ENDIF(CLITK_EXPERIMENTAL)
 #=========================================================
 
+#-----------------------------------------------------------------------------
+# Avoid linker bug in Mac OS 10.5
+# See http://wiki.finkproject.org/index.php/Fink:Packaging:Preparing_for_10.5#OpenGL_Bug
+#
+if(APPLE)
+  FIND_LIBRARY(CoreFoundation_LIBRARY CoreFoundation REQUIRED)
+  FIND_LIBRARY(ApplicationServices_LIBRARY ApplicationServices REQUIRED)
+  FIND_LIBRARY(SystemConfiguration_LIBRARY SystemConfiguration REQUIRED)
+  FIND_LIBRARY(Security_LIBRARY Security REQUIRED)
+  set(APPLE_FRAMEWORKS ${CoreFoundation_LIBRARY} 
+    ${ApplicationServices_LIBRARY} 
+    ${SystemConfiguration_LIBRARY}
+    ${Security_LIBRARY}
+    )
+  message(STATUS "===== ${APPLE_FRAMEWORKS}")
+endif()
 #=========================================================
 #Create binary and libs for tests
-SET(vvExternalLibs ${QT_QTNETWORK_LIBRARY} clitkSegmentationGgoLib ${toolLibs} ${foundationLibraries} ${vvCxImage})
+SET(vvExternalLibs clitkSegmentationGgoLib ${toolLibs} ${foundationLibraries} ${vvCxImage} ${QT_LIBRARIES} ${QT_QTNETWORK_LIBRARY} ${APPLE_FRAMEWORKS})
 # QtNetwork is required by vvRegisterForm
 
 ADD_LIBRARY(vvLib ${vv_SRCS} ${vv_UI_CXX})
@@ -232,7 +248,7 @@ ELSE(WIN32)
   ADD_EXECUTABLE(vv vv.cxx)
 ENDIF(WIN32)
 
-TARGET_LINK_LIBRARIES(vv vvLib  ${CLITK_GDCM_LIBRARIES})
+TARGET_LINK_LIBRARIES(vv vvLib)
 
 #=========================================================
 # Install options (also used by CPack)