X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FCMakeLists.txt;h=998678949445350b4841c8ab7d0d136f2f76b9d8;hb=4eb6f95e59a7602564b15f9d0715650dc91442a2;hp=98955708a30d5b09d0ae0f0f96d63776ad2981bd;hpb=226d4c1d1400f7b5f95e6ec9766ed148e1683ecf;p=clitk.git diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt index 9895570..9986789 100644 --- a/vv/CMakeLists.txt +++ b/vv/CMakeLists.txt @@ -6,7 +6,7 @@ if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) endif(COMMAND cmake_policy) #========================================================= - +OPTION(CLITK_USE_PACS_CONNECTION "USE PACS CONNECTION" OFF) #========================================================= #List of vv tools to compile SET(vv_TOOLS @@ -86,8 +86,8 @@ SET(vv_SRCS vvSlicerManager.cxx vvSlicerManagerCommand.cxx vvUtils.cxx -# vvMaximumIntensityProjection.cxx - vvMesh.cxx +# vvMaximumIntensityProjection.cxx + vvMesh.cxx vvMeshActor.cxx vvMeshReader.cxx vvMidPosition.cxx @@ -122,12 +122,28 @@ QT4_WRAP_CPP(vv_SRCS QT4_WRAP_UI(vv_UI_CXX qt_ui/vvHelpDialog.ui qt_ui/vvDocumentation.ui - qt_ui/vvDicomSeriesSelector.ui - qt_ui/vvDummyWindow.ui #For testing - ) + qt_ui/vvDicomSeriesSelector.ui +qt_ui/vvDummyWindow.ui #For testing +#qt_ui/vvPacsConnection.ui + # qt_ui/vvPacsSettingsDialog.ui +) QT4_ADD_RESOURCES(vv_SRCS vvIcons.qrc) +# Add DICOM SERVER gui selector if the adequate GDCM is available +IF(CLITK_USE_PACS_CONNECTION) + SET(vv_SRCS ${vv_SRCS} + vvQPacsConnection.cxx + vvPacsSettingsDialog.cxx + vvDicomServerQueryFactory.cxx + ) + QT4_WRAP_CPP(vv_SRCS vvQPacsConnection.h + vvPacsSettingsDialog.h) + QT4_WRAP_UI(vv_UI_CXX + qt_ui/vvPacsConnection.ui + qt_ui/vvPacsSettingsDialog.ui) +ENDIF(CLITK_USE_PACS_CONNECTION) + # Add the autotools in the header vvToolsList.h for initialization of the dummy # variables in vv.cxx for the tools contained in vvLib if(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/vvToolsList.h) @@ -141,15 +157,15 @@ endif(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt IS_NEWER_THAN ${CMAKE_CURRENT_B # Add the autotools and the common files ui foreach(tool ${vv_TOOLS} ${vv_COMMON_WITH_UI}) - SET(vv_SRCS ${vv_SRCS} ${tool}.cxx) - QT4_WRAP_CPP(vv_SRCS ${tool}.h) - QT4_WRAP_UI(vv_UI_CXX qt_ui/${tool}.ui) + SET(vv_SRCS ${vv_SRCS} ${tool}.cxx) + QT4_WRAP_CPP(vv_SRCS ${tool}.h) + QT4_WRAP_UI(vv_UI_CXX qt_ui/${tool}.ui) endforeach(tool) # Add the common source files foreach(tool ${vv_COMMON}) - SET(vv_SRCS ${vv_SRCS} ${tool}.cxx) - QT4_WRAP_CPP(vv_SRCS ${tool}.h) + SET(vv_SRCS ${vv_SRCS} ${tool}.cxx) + QT4_WRAP_CPP(vv_SRCS ${tool}.h) endforeach(tool) # if Windows and Qt was built as a static lib then don't set QT_DLL flag