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

diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index 0fb02b1..08e6f47 100644
--- a/lib/maracasVisuLib/CMakeLists.txt
+++ b/lib/maracasVisuLib/CMakeLists.txt
@@ -29,12 +29,13 @@ 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)
+	#INCLUDE(include/Modules/MARACAS_Find_LIBIDO.cmake)
 	#SET(CREA_LIBRARIES C:/creaBin/Debug/crea.lib)
 	#FIND_PACKAGE(crea)
 #jhcl-End===========================================================================
@@ -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
@@ -55,7 +57,7 @@ IF ( BUILD_${LIBRARY_NAME} )
     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/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
@@ -120,6 +122,7 @@ IF ( BUILD_${LIBRARY_NAME} )
 #    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
@@ -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})
@@ -271,7 +274,8 @@ INSTALL(
   ) 
 INSTALL(
   TARGETS ${LIBRARY_NAME}
-  DESTINATION lib)
+  DESTINATION bin )
+