Removing references to GDCM

[creaMaracasVisu.git] / lib / maracasVisuLib / CMakeLists.txt

diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index 581d8d748e1ee7fa337c04cc5519b2e048942a21..e8e313ff7630d0dc76f994937a0ad005c7793a4c 100644 (file)
--- a/lib/maracasVisuLib/CMakeLists.txt
+++ b/lib/maracasVisuLib/CMakeLists.txt
@@ -53,8 +53,8 @@ IF ( BUILD_${LIBRARY_NAME} )
     src/interface/wxWindows/Contour/ContourPropagation.h
     src/interface/wxWindows/Contour/contoursIntersection.h
     src/interface/wxWindows/Contour/vectorFunctions.h
-    src/interface/wxWindows/wxMaracasImageBrowser02.h
-    src/interface/wxWindows/widgets/wxReadingPriorityPanel.h
+##    src/interface/wxWindows/wxMaracasImageBrowser02.h
+##    src/interface/wxWindows/widgets/wxReadingPriorityPanel.h
     src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.h
     src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.h
     src/interface/wxWindows/widgets/vtkClosePolyData.h
@@ -92,7 +92,7 @@ IF ( BUILD_${LIBRARY_NAME} )
     include/matrix.h
     src/kernel/marImageData.h
     src/kernel/marDicomBase.h
-    src/kernel/marGdcmDicom.h
+  #  src/kernel/marGdcmDicom.h
     src/kernel/marObject.h
     src/kernel/volume.hxx
     src/kernel/marTypes.h
@@ -117,8 +117,8 @@ IF ( BUILD_${LIBRARY_NAME} )
     src/interface/wxWindows/Contour/ContourPropagation.cxx
     src/interface/wxWindows/Contour/contoursIntersection.cxx
     src/interface/wxWindows/Contour/vectorFunctions.cxx
-    src/interface/wxWindows/wxMaracasImageBrowser02.cxx
-    src/interface/wxWindows/widgets/wxReadingPriorityPanel.cpp
+#    src/interface/wxWindows/wxMaracasImageBrowser02.cxx
+#    src/interface/wxWindows/widgets/wxReadingPriorityPanel.cpp
     src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx
     src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.cxx
     src/interface/wxWindows/widgets/vtkClosePolyData.cxx
@@ -158,7 +158,7 @@ IF ( BUILD_${LIBRARY_NAME} )
 ###
        src/kernel/marImageData.cpp
        src/kernel/marDicomBase.cpp
-       src/kernel/marGdcmDicom.cpp
+#      src/kernel/marGdcmDicom.cpp
        src/kernel/marObject.cpp
        src/kernel/volume.cxx
        src/kernel/marParameters.cpp
@@ -176,7 +176,7 @@ IF ( BUILD_${LIBRARY_NAME} )
         ${WXWIDGETS_LIBRARIES}
         ${VTK_LIBRARIES}
         ${ITK_LIBRARIES}
-        ${GDCM_LIBRARIES}
+#        ${GDCM_LIBRARIES}
     #    ${BOOST_LIBRARIES}
        #jhcl-Start===========================================================================
                
@@ -236,15 +236,22 @@ SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
     lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter
        lib/maracasVisuLib/../../../
 )
+IF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
+  SET(CILFC_EXECUTABLE_OUTPUT_REL_PATH ".")
+ELSE ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
+  FILE(RELATIVE_PATH 
+    CILFC_EXECUTABLE_OUTPUT_REL_PATH
+    ${PROJECT_BINARY_DIR} ${EXECUTABLE_OUTPUT_PATH})
+ENDIF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
 
 IF(UNIX)
   SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS
-    ${EXECUTABLE_OUTPUT_REL_PATH})
+    ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
   SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
 ELSE(UNIX)
   SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS
-    ${EXECUTABLE_OUTPUT_REL_PATH}/Debug
-    ${EXECUTABLE_OUTPUT_REL_PATH}/Release)
+    ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}/Debug
+    ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}/Release)
   SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin)
 ENDIF(UNIX)
   SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME})