Patch for finding QT4

[crea.git] / cmake / CREAMacro_FindAndUseLibraries.cmake

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index ab39565dab0ab7c3f7d3c0a995f5d2d8756e157b..99cea3f3634ed4b71eba5510a6ee30027f0328a2 100644 (file)
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -2,6 +2,42 @@
 
 MACRO(CREA_FIND_AND_USE_LIBRARIES)
 
+#-----------------------------------------------------------------------------
+# If one can invoke this macro then crea has already been found !!
+# However if one whishes to link against crea and crea was built 
+# with wx or vtk then we have to find them.
+# This USE_CREA var is made to resolve this dependency.
+IF(USE_CREA)
+  IF(CREA_BUILT_WITH_WX)
+    SET(USE_WXWIDGETS ON)
+  ENDIF(CREA_BUILT_WITH_WX)
+  IF(CREA_BUILT_WITH_VTK)
+    SET(USE_VTK ON)
+  ENDIF(CREA_BUILT_WITH_VTK)
+ENDIF(USE_CREA)
+#-----------------------------------------------------------------------------
+
+
+#-----------------------------------------------------------------------------
+IF(USE_QT4)
+  IF(NOT QT_FOUND)
+    FIND_PACKAGE(Qt4 REQUIRED)
+    IF(QT_FOUND)
+      MESSAGE ( STATUS "=======================================")
+      MESSAGE ( STATUS "Looking for QT4... found")
+      MESSAGE ( STATUS "* Inc Dir = ${QT_INCLUDE_DIR}")
+      MESSAGE ( STATUS "* Version = ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}")
+      INCLUDE(${QT_USE_FILE})
+      CREA_DEFINE( USE_QT )
+    #    SET(QT_LIBRARIES
+    #      ${QT_LIBRARIES}
+    #      ) 
+    #  MARK_AS_ADVANCED(Qt4_DIR)
+   ENDIF(QT_FOUND)
+  ENDIF(NOT QT_FOUND)
+ENDIF(USE_QT4)
+#-----------------------------------------------------------------------------
+
 #-----------------------------------------------------------------------------
 IF(USE_VTK)
   INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseVTK.cmake)
@@ -10,7 +46,7 @@ ENDIF(USE_VTK)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
-IF(USE_KW)
+IF(USE_KWWIDGETS)
   IF(NOT KWWidgets_FOUND)
     # Search KWWidgets
     FIND_PACKAGE(KWWidgets)
@@ -35,7 +71,7 @@ IF(USE_KW)
       message(FATAL_ERROR "KWWidgets_DIR not found")
     ENDIF(KWWidgets_FOUND)
   ENDIF(NOT KWWidgets_FOUND)
-ENDIF(USE_KW)
+ENDIF(USE_KWWIDGETS)
 #-----------------------------------------------------------------------------
 
 
@@ -51,6 +87,7 @@ IF(USE_ITK)
       MESSAGE ( STATUS "Looking for ITK... found")
       MESSAGE ( STATUS "* Dir     = ${ITK_DIR}")
       MESSAGE ( STATUS "* Version = ${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}.${ITK_VERSION_PATCH}")
+      SET(SKIP_ITK_BUILD_SETTINGS_FILE ON)
       INCLUDE(${ITK_USE_FILE})
       CREA_DEFINE( USE_ITK )
       CREA_DEFINE( _USE_ITK_ )
@@ -196,7 +233,7 @@ ENDIF(USE_DOXYGEN)
 
 
 #-----------------------------------------------------------------------------
-IF(USE_LATEX) 
+IF(USE_LATEX)
   IF (NOT LATEX_COMPILER)
     FIND_PACKAGE(LATEX REQUIRED)
     MESSAGE ( STATUS "=======================================")
@@ -220,6 +257,7 @@ IF(USE_TTH)
 ENDIF(USE_TTH)
 #-----------------------------------------------------------------------------
 
+
 #-----------------------------------------------------------------------------
 IF(USE_BOOST)
   IF(NOT Boost_FOUND)
@@ -231,10 +269,20 @@ IF(USE_BOOST)
       LINK_DIRECTORIES( ${Boost_LIBRARY_DIRS} )
       CREA_DEFINE( USE_BOOST )
       IF(NOT WIN32)
-       SET(BOOST_LIBRARIES
-         boost_signals
-         boost_filesystem
-         )
+       IF(NOT APPLE)
+         SET(BOOST_LIBRARIES
+           boost_signals
+           boost_filesystem
+            boost_date_time
+           )
+       ELSE(NOT APPLE)
+         SET(BOOST_LIBRARIES
+           boost_signals-mt
+           boost_filesystem-mt
+           boost_date_time-mt
+            boost_system-mt
+           )
+       ENDIF(NOT APPLE)
       ENDIF(NOT WIN32)
       MARK_AS_ADVANCED(Boost_INCLUDE_DIR)
     ELSE(Boost_FOUND)