X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FCMakeLists.txt;h=76c19e6802bac93807ac73e3230f93118a6b7b0c;hb=1c402506d8f184899673b73f5def6bd98d73f116;hp=ebe4dff285808e01b16ec47eef0df5c969723bd3;hpb=6fa2cf3d8bd3e42e5103da3f04f12fc90c671bbd;p=clitk.git diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index ebe4dff..76c19e6 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -1,7 +1,3 @@ -#========================================================= -INCLUDE(${PROJECT_SOURCE_DIR}/cmake/common.cmake) -#========================================================= - #========================================================= # make clitk libraries* CONFIGURE_FILE(clitkConfiguration.h.in ${PROJECT_BINARY_DIR}/clitkConfiguration.h) @@ -13,6 +9,8 @@ SET(clitkCommon_SRC clitkImageCommon.cxx clitkTransformUtilities.cxx clitkIO.cxx + clitkGateAsciiImageIO.cxx + clitkGateAsciiImageIOFactory.cxx clitkVoxImageIO.cxx clitkVoxImageIOFactory.cxx clitkVfImageIO.cxx @@ -35,6 +33,16 @@ SET(clitkCommon_SRC vvImageReader.cxx vvImageWriter.cxx ) +IF(CLITK_PRIVATE_FEATURES) + SET(clitkCommon_SRC ${clitkCommon_SRC} + ${PROJECT_SOURCE_DIR}/private_features/clitkUsfImageIO.cxx + ${PROJECT_SOURCE_DIR}/private_features/clitkUsfImageIOFactory.cxx + ${PROJECT_SOURCE_DIR}/private_features/clitkUSVoxImageIO.cxx + ${PROJECT_SOURCE_DIR}/private_features/clitkUSVoxImageIOFactory.cxx + ${PROJECT_SOURCE_DIR}/private_features/clitkSvlImageIO.cxx + ${PROJECT_SOURCE_DIR}/private_features/clitkSvlImageIOFactory.cxx + ) +ENDIF(CLITK_PRIVATE_FEATURES) ### Declare clitkCommon library ADD_LIBRARY(clitkCommon STATIC ${clitkCommon_SRC}) @@ -49,7 +57,7 @@ ADD_LIBRARY(clitkDicomRTStruct STATIC clitkDicomRT_Contour.cxx clitkDicomRT_ROI.cxx clitkDicomRT_StructureSet.cxx - clitkDicomRT_ROI_ConvertToImageFilter.cxx + clitkDicomRTStruct2ImageFilter.cxx ) TARGET_LINK_LIBRARIES(clitkDicomRTStruct vtkHybrid) @@ -57,8 +65,3 @@ TARGET_LINK_LIBRARIES(clitkDicomRTStruct vtkHybrid) #ADD_LIBRARY(clitkCommonShared SHARED ${clitkCommon_SRC}) #SET_TARGET_PROPERTIES(clitkCommonShared PROPERTIES COMPILE_FLAGS -fPIC) -#passing environnment variable -configure_file ( - globals.h.in - globals.h -)