X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2FCMakeLists.txt;h=d1d8438b540b8d94cb24eb2ff829e2e95d0ecb60;hb=a9d9fb67805b906ffb5912f56eae5578a7c432ca;hp=e999a34cafd439a1e1857d3bff3ee8cf3b66c6d3;hpb=446281de7dfca0fc33aa997a714dd7859c9c1768;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index e999a34..d1d8438 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} )
@@ -91,6 +91,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
@@ -100,6 +101,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.cpp
   )
   #----------------------------------------------------------------------------
 
@@ -121,6 +124,8 @@ 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/wxVTKRenderWindowInteractor.cxx
     src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.cxx
     src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.cxx
@@ -158,6 +163,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
@@ -166,6 +172,7 @@ IF ( BUILD_${LIBRARY_NAME} )
 	src/kernel/volume.cxx
 	src/kernel/marParameters.cpp
 	src/kernel/marDynData.cpp	
+	src/kernel/vtkSTLExtractor.cpp
   )
   #----------------------------------------------------------------------------
 #jhcl-Start===========================================================================
@@ -208,9 +215,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})
 
@@ -254,8 +259,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})
@@ -273,9 +277,15 @@ INSTALL(
   FILES ${${LIBRARY_NAME}_HEADERS}
   DESTINATION ${${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS}
   ) 
-INSTALL(
-  TARGETS ${LIBRARY_NAME}
-  DESTINATION bin )
+IF(WIN32)	
+  INSTALL(
+    TARGETS ${LIBRARY_NAME}
+    DESTINATION bin)
+ELSE(WIN32)
+  INSTALL(
+    TARGETS ${LIBRARY_NAME}
+    DESTINATION lib)
+ENDIF(WIN32)