X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FCMakeLists.txt;h=12e38a5d36ae0d254d46b17f8fecea4613d412ba;hb=451f8e875ec446efa2235abc2085fcf6ec67f523;hp=39a5e0a01a3772d89349c40144c4a7d3a2e61fcb;hpb=b7fc1156967b4af59750b0f2023e4ec7781b723b;p=clitk.git

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index 39a5e0a..12e38a5 100644
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -11,13 +11,13 @@ 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
   
@@ -30,14 +30,14 @@ 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(vvToolRigidReg_LIBS clitkAffineRegistrationLib)
 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)
+SET(vvToolCropImage_LIBS clitkCropImageLib)
+SET(vvToolMIP_LIBS clitkMIPLib)
 
 #=========================================================
 # List of vv source files
@@ -84,7 +84,7 @@ SET(vv_SRCS
   vvSlicerManager.cxx
   vvSlicerManagerCommand.cxx
   vvUtils.cxx
-  vvMaximumIntensityProjection.cxx
+#  vvMaximumIntensityProjection.cxx
   vvMesh.cxx
   vvMeshActor.cxx
   vvMeshReader.cxx
@@ -167,11 +167,11 @@ INCLUDE_DIRECTORIES(
 
 #=========================================================
 #support for parallel deformable registration with OpenMP
-IF(NOT __APPLE__)
+IF(NOT APPLE)
 IF(CMAKE_COMPILER_IS_GNUCC)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
-ENDIF(NOT __APPLE__)
+ENDIF(NOT APPLE)
 #=========================================================
 
 #=========================================================
@@ -185,9 +185,9 @@ 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)
+ADD_DEPENDENCIES(vv clitkSegmentationGgoLib)
 TARGET_LINK_LIBRARIES(vv clitkDicomRTStruct)
 
 #=========================================================
@@ -205,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)