X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=064b4efd364d0fc16283986250d983b7f8a38055;hb=1a4b973f2cfd974147a10756eb7d2b10ff524ddc;hp=d7b27ba0454c9178f077956bbff56a722642169f;hpb=68dcaeeb31dcf2b3e4f1f4f3f53f7daa1fd4bc37;p=creaImageIO.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d7b27ba..064b4ef 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -56,6 +56,11 @@ IF(USE_GDCM2)
 		        )
 ENDIF(USE_GDCM2)
 
+IF (USE_WXWIDGETS)
+	FILE(GLOB SOURCES_CREAIMAGEIO_MULTI_IMG_READER   creaImageIOMultiThreadImageReader.cpp)
+ELSEIF(USE_QT4)
+	FILE(GLOB SOURCES_CREAIMAGEIO_MULTI_IMG_READER   creaImageIOQMultiThreadImageReader.cpp)
+ENDIF()
 
 FILE(GLOB SOURCES_CREAIMAGEIO_IMG_READER
 	  creaImageIOSimpleView.cpp
@@ -63,8 +68,8 @@ FILE(GLOB SOURCES_CREAIMAGEIO_IMG_READER
 	  creaImageIOImageReader.cpp
 	  creaImageIOUltrasonixImageReader.cpp
 	  creaImageIOVtkImageReader.cpp
-	  creaImageIOQMultiThreadImageReader.cpp
 	  ${SOURCES_CREAIMAGEIO_IMG_DICOM_READER}
+	  ${SOURCES_CREAIMAGEIO_MULTI_IMG_READER}
  	  )
 #--------------------------------------------
 # The wxWidgets-based components
@@ -91,7 +96,6 @@ if (USE_WXWIDGETS)
 		  creaImageIOExternalGimmick.cpp
 		  BlockScopeWxApp.cpp
 		  creaImageIOListener.cpp
-		  creaImageIOMultiThreadImageReader.cpp
 		  )
 	SOURCE_GROUP("Source Files\\GUI" FILES ${SOURCES_CREAIMAGEIO_WX})
 endif(USE_WXWIDGETS)
@@ -306,10 +310,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})
 
@@ -319,7 +323,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(