-SET(LIBRARY_NAME creaImageIO2)
+SET(LIBRARY_NAME creaImageIO)
FILE(GLOB SOURCES_CREAIMAGEIO
IF(USE_GDCM2)
FILE(GLOB SOURCES_CREAIMAGEIO_IMG_DICOM_READER
- creaImageIODicomImageReader2.cpp)
+ creaImageIODicomImageReader2.cpp
+ creaImageIODicomScanner.cpp)
ENDIF(USE_GDCM2)
# Image Readers
# ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
# )
SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
- src2
+ src
win32
)
SET(${LIBRARY_NAME}_HAS_ADDITIONAL_CONFIG_FILE TRUE)
SET(${LIBRARY_NAME}_ADDITIONAL_CONFIG_FILE
- ${PROJECT_SOURCE_DIR}/src2/Additional${LIBRARY_NAME}Config.cmake.in)
+ ${PROJECT_SOURCE_DIR}/src/Additional${LIBRARY_NAME}Config.cmake.in)
SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE
- ${PROJECT_SOURCE_DIR}/src2/AdditionalUse${LIBRARY_NAME}.cmake.in)
+ ${PROJECT_SOURCE_DIR}/src/AdditionalUse${LIBRARY_NAME}.cmake.in)
# Invoke the advanced macro
CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
IF (WIN32)
- SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src2/data)
+ SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src/data)
SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/bin/Shared/gimmick)
ELSE (WIN32)
- SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src2/data)
+ SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src/data)
SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/share/gimmick)
ENDIF (WIN32)
CREA_CPDIR(${INPUT_DATA_DIR} ${OUTPUT_DATA_DIR})
INCLUDE_DIRECTORIES(
# ${PROJECT_BINARY_DIR}
- ${PROJECT_SOURCE_DIR}/src2
-# ${PROJECT_SOURCE_DIR}/src2/CppSQLite3
+ ${PROJECT_SOURCE_DIR}/src
+# ${PROJECT_SOURCE_DIR}/src/CppSQLite3
)