X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=075d0916e000ddeb8c5be8b0553862ef6128b311;hb=c7bbeea5328158023e6df42b77d3479b69148faf;hp=0432a40930a23958fa814907d36f44d5f9ce9f94;hpb=bf3660569b1baa8be10fc708f595efc66afe3334;p=creaImageIO.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0432a40..075d091 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,5 @@
 #
 # Test CMake version
-#
-
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 
 #MARK_AS_ADVANCED( FORCE CMAKE_BACKWARDS_COMPATIBILITY )
@@ -12,45 +10,72 @@ IF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VER
   CMAKE_POLICY(SET CMP0011 NEW)
 ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
 
-
+###################################
 PROJECT(creaImageIO)
+###################################
 
+#==================================
+# The project version
 SET(PROJECT_MAJOR_VERSION 0)
 SET(PROJECT_MINOR_VERSION 2)
 SET(PROJECT_BUILD_VERSION 5)
 SET(CREA_VERBOSE_CMAKE TRUE)
 
+# JPR 4 mars 2011
+set (CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Module)
+
+#==================================
+# Find crea (mandatory, to use macros)
 FIND_PACKAGE(crea REQUIRED)
 IF (crea_FOUND)
   INCLUDE(${crea_USE_FILE})
 ENDIF(crea_FOUND)
+#==================================
 
+#==================================
+# Do not allow to build inside the source tree
+CREA_PREVENT_IN_SOURCE_BUILD()
+#==================================
 
 
+# For boost 1.46 troubles...  // JPR.
+add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
 
 SET(USE_GDCM_VTK ON)
 
 SET(USE_VTK ON)
-SET(USE_ITK OFF)
+
 SET(USE_BOOST ON)
 OPTION(USE_WXWIDGETS "Use WxWidgets GUI" ON)
-OPTION(USE_QT4 "USE WxWidgets GUI"       OFF)
+OPTION(USE_QT4 "USE QT4GUI"       OFF)
 OPTION(USE_XERCES "USE Xerces if you want to use an beta version of outputModel" OFF)
+OPTION(USE_INSTALL_APP "install only useful applications" ON)
 
 IF(USE_QT4)
 	IF(USE_WXWIDGETS)
-		 MESSAGE(STATUS "CANNOT USE QT WXWIDGETS IN SAME TIME")
+		 MESSAGE(ERROR "CANNOT USE QT WXWIDGETS IN SAME TIME")
 	ENDIF(USE_WXWIDGETS)
 ENDIF(USE_QT4)
 		 
-		 
-OPTION(USE_GDCM ON)
-OPTION(USE_GDCM2 OFF)
+IF(QT4_FOUND)
+ IF (WIN32)
+ MESSAGE("So ... ${QT_DIR}")
+		INCLUDE_DIRECTORIES(${QT_DIR}/../include)		
+		LINK_DIRECTORIES(${QT_DIR}/../lib)
+ ENDIF(WIN32)
+ENDIF(QT4_FOUND)
+#
+# ----------------- manual setting GDCM/GDCM2 JPR
+#		 
+OPTION(USE_GDCM "Use gdcm 1.3" ON)
+OPTION(USE_GDCM2 "Use gdcm 2.0.14 at least" OFF)
+
  MESSAGE(STATUS "GDCM LIB ....= ${GDCM_LIBRARIES}")
 IF(USE_GDCM2)
 	OPTION(USE_GDCM_ANOM "use gdcm2 anonymizer tool" OFF)
 	#TO DO TEST IF GDCM_USE_SYSTEM_OPENSSL is valid
 ENDIF(USE_GDCM2)
+OPTION(USE_ITK "use ITK" ON)
 CREA_FIND_AND_USE_LIBRARIES()
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
@@ -62,19 +87,22 @@ MARK_AS_ADVANCED(
   )
 
 IF(WIN32)
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
-LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
+	IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 4)
+		INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
+		LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
+	endif()
+	IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 8)
+		INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/win64)
+		LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win64)
+	endif()
 ENDIF(WIN32)
 
-
-
-
 SET(LIBNAME creaImageIO)
 	INCLUDE_DIRECTORIES(
     ${PROJECT_BINARY_DIR}
     ${PROJECT_SOURCE_DIR}/src
     )
-SUBDIRS(src)
+ADD_SUBDIRECTORY(src)
 
 
 OPTION(BUILD_CREA_BRUKER "Build creaIRM with creaBruker?" ON)
@@ -94,9 +122,25 @@ IF (BUILD_CREA_PACS)
 	CREA_DEFINE(BUILD_PACS)
 ENDIF(BUILD_CREA_PACS)
 
-#
-SUBDIRS(appli)
-SUBDIRS(bbtk)
-SUBDIRS(win32)
-SUBDIRS(install)
+#==================================
+# Subdirs
+
+ADD_SUBDIRECTORY(appli)
+ADD_SUBDIRECTORY(bbtk)
+
+#EED 31/05/2011   not compiling 
+#ADD_SUBDIRECTORY(tests)
+
+IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 4)
+	ADD_SUBDIRECTORY(win32)
+endif()
+IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 8)
+	ADD_SUBDIRECTORY(win64)
+endif()
+
+ADD_SUBDIRECTORY(install)
+#==================================
+
 
+#EED 31/05/2011   not compiling 
+#ENABLE_TESTING()