X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2FCMakeLists.txt;h=08e6f47ecde47e146846089b947d9f4be86c11d7;hb=e35c619cb84c22854f9e08ffc8634a6cc65f381c;hp=c9ea732c8a905fe4026a6495beb45a9107057a2f;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index c9ea732..08e6f47 100644
--- a/lib/maracasVisuLib/CMakeLists.txt
+++ b/lib/maracasVisuLib/CMakeLists.txt
@@ -1,6 +1,6 @@
 #----------------------------------------------------------------------------
 # SET THE NAME OF YOUR LIBRARY
-SET ( LIBRARY_NAME   maracasVisuLib  )
+SET ( LIBRARY_NAME   creaMaracasVisu  )
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
@@ -29,14 +29,15 @@ IF ( BUILD_${LIBRARY_NAME} )
     src/kernel
 	#${MARACAS_SOURCE_DIR}/src/SnakeIsoContour+Deriche
     src/interface/wxWindows
+    src/interface/wxWindows/Contour
     src/interface/wxWindows/widgets
     src/interface/wxWindows/widgets/pPlotter
 	../../../
 )
 	#message(jhcl\n\n ${crea_LIBRARIES})
-	INCLUDE(include/Modules/MARACAS_Find_LIBIDO.cmake)
-	SET(CREA_LIBRARIES C:/creaBin/Debug/crea.lib)
-	FIND_PACKAGE(crea)
+	#INCLUDE(include/Modules/MARACAS_Find_LIBIDO.cmake)
+	#SET(CREA_LIBRARIES C:/creaBin/Debug/crea.lib)
+	#FIND_PACKAGE(crea)
 #jhcl-End===========================================================================
   #----------------------------------------------------------------------------
   # LIBRARY HEADERS (TO BE INSTALLED)
@@ -46,6 +47,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   SET ( ${LIBRARY_NAME}_HEADERS
   	src/interface/wxWindows/manualContour.h
 	src/interface/wxWindows/Contour/ContourCrownWidget.h
+	src/interface/wxWindows/Contour/ContourExtractData.h
 	src/interface/wxWindows/Contour/ContourVOIWidget.h  
     src/interface/wxWindows/Contour/Propagation.h
     src/interface/wxWindows/Contour/ExtractControlPoints2D.h
@@ -53,9 +55,9 @@ 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/widgets/wxVTKRenderWindowInteractor.h
+##    src/interface/wxWindows/wxMaracasImageBrowser02.h
+##    src/interface/wxWindows/widgets/wxReadingPriorityPanel.h
+    src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.h     src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h
     src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.h
     src/interface/wxWindows/widgets/vtkClosePolyData.h
     src/interface/wxWindows/wxMaracasMPR.h
@@ -89,10 +91,10 @@ IF ( BUILD_${LIBRARY_NAME} )
     src/interface/wxWindows/widgets/pPlotter/mathplot.h
     src/interface/wxWindows/widgets/pPlotter/MaximumsDialog.h
     src/interface/wxWindows/widgets/pPlotter/Histogram.h
-    /../include/matrix.h
+    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,9 +119,10 @@ 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/wxVTKRenderWindowInteractorEditContour.cxx
     src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.cxx
     src/interface/wxWindows/widgets/vtkClosePolyData.cxx
     src/interface/wxWindows/wxMaracasMPR.cxx
@@ -158,7 +161,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 +179,7 @@ IF ( BUILD_${LIBRARY_NAME} )
         ${WXWIDGETS_LIBRARIES}
         ${VTK_LIBRARIES}
         ${ITK_LIBRARIES}
-        ${GDCM_LIBRARIES}
+#        ${GDCM_LIBRARIES}
     #    ${BOOST_LIBRARIES}
 	#jhcl-Start===========================================================================
 		
@@ -209,7 +212,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   CREA_MANAGE_SHARED_LIBRARY(${LIBRARY_NAME})
 
   # CREATE THE TARGET
-  ADD_LIBRARY(${LIBRARY_NAME} ${${LIBRARY_NAME}_SHARED} ${${LIBRARY_NAME}_SOURCES})
+  ADD_LIBRARY(${LIBRARY_NAME} ${${LIBRARY_NAME}_SHARED} ${${LIBRARY_NAME}_SOURCES} ${${LIBRARY_NAME}_HEADERS})
 
   # LINK
   TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${${LIBRARY_NAME}_LINK_LIBRARIES})
@@ -236,15 +239,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})
@@ -264,7 +274,8 @@ INSTALL(
   ) 
 INSTALL(
   TARGETS ${LIBRARY_NAME}
-  DESTINATION lib)
+  DESTINATION bin )
+