X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=27d93ce706eedc70daee54e54cdcdd8f1e0a73a9;hb=3213e0d7adb70f52d723a5b7065f4780b6c9e451;hp=19f21247240ee570b415d0670c1456b6d150f7c0;hpb=718ad9d145c2e31201b42dfd4709eeec90a96eb6;p=creaImageIO.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 19f2124..27d93ce 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -71,6 +71,15 @@ FILE(GLOB SOURCES_CREAIMAGEIO_IMG_READER
 	  ${SOURCES_CREAIMAGEIO_IMG_DICOM_READER}
 	  ${SOURCES_CREAIMAGEIO_MULTI_IMG_READER}
  	  )
+IF(USE_ITK)
+FILE(GLOB SOURCES_CREAIMAGEIO_ITK_DLG
+	creaImageIOWxIsimpleDlg.h
+	creaImageIOWxIsimpleDlg.hpp
+	creaImageIOWxAnySimpleDlg.h
+	creaImageIOWxAnySimpleDlg.cpp
+	)
+ENDIF(USE_ITK)
+	  
 #--------------------------------------------
 # The wxWidgets-based components
 if (USE_WXWIDGETS)
@@ -160,7 +169,7 @@ SOURCE_GROUP("Source Files\\Readers" FILES ${SOURCES_CREAIMAGEIO_IMG_READER}
 											${SOURCES_CREAIMAGEIO_IMG_DICOM_READER})
 SOURCE_GROUP("Source Files\\Tree" FILES ${SOURCES_CREAIMAGEIO_TREE})
 
-
+SOURCE_GROUP("Source Files\\ITK" FILES ${SOURCES_CREAIMAGEIO_ITK_DLG})
 
 
 IF(USE_WXWIDGETS)
@@ -182,6 +191,7 @@ SET( PRIMITIVE_SRCS
  ${SOURCES_CREAIMAGEIO_IMG_DICOM_READER}
  ${GUI_SRCS}
  ${SOURCES_CREAIMAGEIO_TREE}
+ ${SOURCES_CREAIMAGEIO_ITK_DLG}
 )
 
 
@@ -236,6 +246,7 @@ TARGET_LINK_LIBRARIES(${LIBRARY_NAME}
   ${VTK_LIBRARIES}
   ${GDCM_LIBRARIES}
   ${BOOST_LIBRARIES}
+  ${ITK_LIBRARIES}
   sqlite3)
 ELSE(NOT USE_XERCES)
 TARGET_LINK_LIBRARIES(${LIBRARY_NAME} 
@@ -310,10 +321,10 @@ SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE
   CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
 IF (WIN32)
 	SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src/data)
-	SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/bin/share/gimmick)
+	SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/bin/share/creaImageIO)
 ELSE (WIN32)
 	SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src/data)
-	SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/share/gimmick)
+	SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/share/creaImageIO)
 ENDIF (WIN32)
 CREA_CPDIR(${INPUT_DATA_DIR} ${OUTPUT_DATA_DIR})
 
@@ -323,7 +334,7 @@ CREA_CPDIR(${INPUT_DATA_DIR} ${OUTPUT_DATA_DIR})
 
 OPTION( BUILD_DOXYGEN_DOC "Build doxygen doc ?" OFF)
 IF(BUILD_DOXYGEN_DOC)
-  SUBDIRS(doxygen)
+  ADD_SUBDIRECTORY(doxygen)
 ENDIF(BUILD_DOXYGEN_DOC)
 
 INCLUDE_DIRECTORIES(