X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2FCMakeLists.txt;h=df1664281d63e6882810a6fbfe558c71b9f5123c;hb=cc20770ee090848c31a8f18c277d89f2b904e087;hp=a86c6ccb9e926602057be938b6935f8b090ffc4a;hpb=d1ef3e1240675f38471613ce4aee11b309652f4d;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index a86c6cc..df16642 100644
--- a/lib/maracasVisuLib/CMakeLists.txt
+++ b/lib/maracasVisuLib/CMakeLists.txt
@@ -7,11 +7,11 @@ SET ( LIBRARY_NAME   creaMaracasVisu  )
 # CREATES A USER OPTION IN CMAKE
 OPTION ( BUILD_${LIBRARY_NAME}  "Build ${LIBRARY_NAME} library ?" ON)
 
-#OPTION ( EXPORTS_MaracasKernel  "Build ${LIBRARY_NAME} library ?" ON)
-#IF (EXPORTS_MaracasKernel)
-#	SET(MaracasKernel_EXPORTS)
-#	ADD_DEFINITIONS (-DMaracasKernel_EXPORTS)
-#ENDIF(EXPORTS_MaracasKernel)
+OPTION ( EXPORTS_MaracasKernel  "Build ${LIBRARY_NAME} library ?" ON)
+IF (EXPORTS_MaracasKernel)
+	SET(MaracasKernel_EXPORTS)
+	ADD_DEFINITIONS (-DMaracasKernel_EXPORTS)
+ENDIF(EXPORTS_MaracasKernel)
 
 #----------------------------------------------------------------------------
 IF ( BUILD_${LIBRARY_NAME} )
@@ -29,6 +29,7 @@ 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
 	../../../
@@ -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
@@ -56,6 +58,7 @@ IF ( BUILD_${LIBRARY_NAME} )
 ##    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
@@ -64,6 +67,10 @@ IF ( BUILD_${LIBRARY_NAME} )
     src/interface/wxWindows/widgets/wxVtkBaseView.h
     src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.h 
     src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.h
+	
+	src/interface/wxWindows/widgets/wxMaracasIRMView.h
+	src/interface/wxWindows/widgets/wxMaracasIRMViewManager.h
+	
     src/interface/wxWindows/wxMaracas_ManualTree_MPR.h
     src/interface/wxWindows/widgets/wxManualTree_MPRWidget.h
     src/interface/wxWindows/widgets/ContourView.h
@@ -89,6 +96,7 @@ 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
+	src/interface/wxWindows/widgets/wxSTLWidget_03.h
     include/matrix.h
     src/kernel/marImageData.h
     src/kernel/marDicomBase.h
@@ -98,6 +106,8 @@ IF ( BUILD_${LIBRARY_NAME} )
     src/kernel/marTypes.h
     src/kernel/marParameters.h
     src/kernel/marDynData.h
+    src/kernel/creaMaracasVisu_EXPORT.h 
+	src/kernel/vtkSTLExtractor.h
   )
   #----------------------------------------------------------------------------
 
@@ -119,7 +129,12 @@ IF ( BUILD_${LIBRARY_NAME} )
     src/interface/wxWindows/Contour/vectorFunctions.cxx
 #    src/interface/wxWindows/wxMaracasImageBrowser02.cxx
 #    src/interface/wxWindows/widgets/wxReadingPriorityPanel.cpp
+	
+	src/interface/wxWindows/widgets/wxMaracasIRMView.cxx
+	src/interface/wxWindows/widgets/wxMaracasIRMViewManager.cxx
+	
     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
@@ -155,6 +170,7 @@ IF ( BUILD_${LIBRARY_NAME} )
     src/interface/wxWindows/widgets/pPlotter/mathplot.cxx
     src/interface/wxWindows/widgets/pPlotter/MaximumsDialog.cxx
     src/interface/wxWindows/widgets/pPlotter/Histogram.cxx
+	src/interface/wxWindows/widgets/wxSTLWidget_03.cxx
 ###
 	src/kernel/marImageData.cpp
 	src/kernel/marDicomBase.cpp
@@ -163,6 +179,7 @@ IF ( BUILD_${LIBRARY_NAME} )
 	src/kernel/volume.cxx
 	src/kernel/marParameters.cpp
 	src/kernel/marDynData.cpp	
+	src/kernel/vtkSTLExtractor.cpp
   )
   #----------------------------------------------------------------------------
 #jhcl-Start===========================================================================
@@ -205,9 +222,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   ENDIF(CREA_VERBOSE_CMAKE)
 
 
-  # MANAGE SHARED LIB
-  CREA_MANAGE_SHARED_LIBRARY(${LIBRARY_NAME})
-
+  
   # CREATE THE TARGET
   ADD_LIBRARY(${LIBRARY_NAME} ${${LIBRARY_NAME}_SHARED} ${${LIBRARY_NAME}_SOURCES} ${${LIBRARY_NAME}_HEADERS})
 
@@ -232,6 +247,7 @@ SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
     lib/maracasVisuLib/src/kernel
 	#${MARACAS_SOURCE_DIR}/src/SnakeIsoContour+Deriche
     lib/maracasVisuLib/src/interface/wxWindows
+    lib/maracasVisuLib/src/interface/wxWindows/Contour
     lib/maracasVisuLib/src/interface/wxWindows/widgets
     lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter
 	lib/maracasVisuLib/../../../
@@ -250,8 +266,7 @@ IF(UNIX)
   SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
 ELSE(UNIX)
   SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS
-    ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}/Debug
-    ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}/Release)
+    ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
   SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin)
 ENDIF(UNIX)
   SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME})
@@ -269,9 +284,16 @@ INSTALL(
   FILES ${${LIBRARY_NAME}_HEADERS}
   DESTINATION ${${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS}
   ) 
-INSTALL(
-  TARGETS ${LIBRARY_NAME}
-  DESTINATION lib )
+IF(WIN32)	
+  INSTALL(
+    TARGETS ${LIBRARY_NAME}
+    DESTINATION bin)
+ELSE(WIN32)
+  INSTALL(
+    TARGETS ${LIBRARY_NAME}
+    DESTINATION lib)
+ENDIF(WIN32)
+