Delete widget first, the image data after

[clitk.git] / vv / CMakeLists.txt

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index b14086906fc91d31ea2a7022249e9ebae69d39d7..d52f247b110f61ad59fc38787209fdd1c51b78ba 100644 (file)
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -11,13 +11,14 @@ endif(COMMAND cmake_policy)
 #List of vv tools to compile
 SET(vv_TOOLS
   vvToolMedianFilter
-  vvToolRigidReg ## Very long to compile
+#  vvToolRigidReg ## Very long to compile
   vvToolCropImage
   vvToolBinarize
   vvToolImageArithm
   vvToolResample
-  vvToolExtractPatient
-  vvToolExtractLung
+#  vvToolExtractPatient
+#  vvToolExtractLung
+  vvToolMIP
   vvToolConvert ## with dummy vvToolConvert.ui
   
   ## these ones are for tests (not working)
@@ -28,13 +29,15 @@ SET(vv_TOOLS
 )
 # dependencies of the tools
 # Future issues : when tool depend on other tools ... how to manage that ?
+#  >> add the relevant $_LIBS variable to the tool that has dependencies?
 SET(vvToolRigidReg_LIBS clitkAffineRegistrationLib clitkRegistrationGgoLib)
 SET(vvToolBinarize_LIBS clitkBinarizeImageLib)
-SET(vvToolResample_LIBS clitkImageResampleLib)
+SET(vvToolResample_LIBS clitkResampleImageLib)
 SET(vvToolConvert_LIBS clitkImageConvertLib)
 SET(vvToolExtractPatient_LIBS clitkSegmentationGgoLib)
 SET(vvToolExtractLung_LIBS clitkSegmentationGgoLib)
 SET(vvToolCropImage_LIBS clitkToolsGgoLib)
+SET(vvToolMIP_LIBS clitkMIPLib clitkToolsGgoLib)
 
 #=========================================================
 # List of vv source files
@@ -81,7 +84,7 @@ SET(vv_SRCS
   vvSlicerManager.cxx
   vvSlicerManagerCommand.cxx
   vvUtils.cxx
-  vvMaximumIntensityProjection.cxx
+#  vvMaximumIntensityProjection.cxx
   vvMesh.cxx
   vvMeshActor.cxx
   vvMeshReader.cxx
@@ -182,7 +185,7 @@ IF(WIN32)
   SET(EXE_ICON vvIcon.rc)
 ENDIF(WIN32)
 
-LINK_DIRECTORIES(${QT_INCLUDES})
+LINK_DIRECTORIES(${QT_LIBRARY_DIR})
 ADD_EXECUTABLE(vv ${vv_SRCS} vv.cxx ${vv_UI_CXX} ${EXE_ICON})
 ADD_DEPENDENCIES(vv clitkToolsGgoLib clitkSegmentationGgoLib)
 TARGET_LINK_LIBRARIES(vv clitkDicomRTStruct)
@@ -202,8 +205,10 @@ clitkCommon ${ITK_LIBRARIES} QVTK vtkHybrid)
 #=========================================================
 # Install options (also used by CPack)
 IF(UNIX AND NOT APPLE)
-  INSTALL (FILES ${EXECUTABLE_OUTPUT_PATH}/vv DESTINATION . PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
-  INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/ducky.png DESTINATION .)
+  SET_TARGET_PROPERTIES(vv
+    PROPERTIES INSTALL_RPATH "${VTK_DIR}:${ITK_DIR}" )  
+  INSTALL (TARGETS vv DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
+  #  INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/ducky.png DESTINATION .)
 
   #QT
   #FOREACH(LIB QtCore QtGui QtOpenGL QtNetwork QtSql)