X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=b1d6dfcc67011783926a78ab4cf1e69ecd326314;hb=124b9349d1cc0a7316228bab71f96bc183bcbf6f;hp=24ab59edbd70799818fcc35bda8830d6fc96b863;hpb=8120e03448d7547167fdced4351a91b07a27f72f;p=creaImageIO.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24ab59e..b1d6dfc 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,32 +10,47 @@ 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()
+#==================================
 
-message("link directory ${GDCM_INCLUDE_DIR}")
+message("link directory ${GDCM_INCLUDE_DIR} ?!? ")
 
+# 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 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)
@@ -52,15 +65,20 @@ IF(QT4_FOUND)
 		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()
+message ("itk libs : ${ITK_LIBRARIES}")
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
@@ -86,7 +104,7 @@ SET(LIBNAME creaImageIO)
     ${PROJECT_BINARY_DIR}
     ${PROJECT_SOURCE_DIR}/src
     )
-SUBDIRS(src)
+ADD_SUBDIRECTORY(src)
 
 
 OPTION(BUILD_CREA_BRUKER "Build creaIRM with creaBruker?" ON)
@@ -106,18 +124,21 @@ IF (BUILD_CREA_PACS)
 	CREA_DEFINE(BUILD_PACS)
 ENDIF(BUILD_CREA_PACS)
 
-#
-SUBDIRS(appli)
-SUBDIRS(bbtk)
-SUBDIRS(tests)
+#==================================
+# Subdirs
+
+ADD_SUBDIRECTORY(appli)
+ADD_SUBDIRECTORY(bbtk)
+ADD_SUBDIRECTORY(tests)
 
 IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 4)
-	SUBDIRS(win32)
+	ADD_SUBDIRECTORY(win32)
 endif()
 IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 8)
-	SUBDIRS(win64)
+	ADD_SUBDIRECTORY(win64)
 endif()
 
-SUBDIRS(install)
+ADD_SUBDIRECTORY(install)
+#==================================
 
 ENABLE_TESTING()