X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FCMakeLists.txt;h=acbc86ce05e09ea7f35e59296f6840933db398dd;hb=0a5abf9398aa0c578f014b52ca992943ca653f72;hp=98955708a30d5b09d0ae0f0f96d63776ad2981bd;hpb=226d4c1d1400f7b5f95e6ec9766ed148e1683ecf;p=clitk.git diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt index 9895570..acbc86c 100644 --- a/vv/CMakeLists.txt +++ b/vv/CMakeLists.txt @@ -86,8 +86,7 @@ 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 +121,23 @@ 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 ) QT4_ADD_RESOURCES(vv_SRCS vvIcons.qrc) +# Add DICOM SERVER gui selector if the adequate GDCM is available +#IF(CLITK_USE_SYSTEM_GDCM) +message("ololoa") + SET(vv_SRCS ${vv_SRCS} + vvQPacsConnection.cxx + vvPacsSettingsDialog.cxx) + QT4_WRAP_CPP(vv_SRCS vvQPacsConnection.cxx + vvPacsSettingsDialog.cxx) + QT4_WRAP_UI(vv_UI_CXX qt_ui/vvPacsConnection.ui + qt_ui/vvPacsSettingsDialog.ui) +#ENDIF(CLITK_USE_SYSTEM_GDCM) + # 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 +151,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