X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2FCMakeLists.txt;h=4e6fee64eddcefec5ad5d481d3b3c0824c16eacb;hb=df48ad0b334114b5cd4aad84ffcef91d992c00f1;hp=9e220bd79f3bb1879bf6f503ce27bd9f03d7b2c1;hpb=1b9af7b2c71aa44e2e5adebd2826f26b55d4b209;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index 9e220bd..4e6fee6 100644
--- a/lib/maracasVisuLib/CMakeLists.txt
+++ b/lib/maracasVisuLib/CMakeLists.txt
@@ -26,26 +26,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   #----------------------------------------------------------------------------
   # BUILD LIBRARY
   #----------------------------------------------------------------------------
-#jhcl-Start===========================================================================
-  INCLUDE_DIRECTORIES(
-    include
-    src
-	#${MARACAS_SOURCE_DIR}/src/axe3DVTK
-	#  ${MARACAS_SOURCE_DIR}/src/interface
-    src/kernel
-	#${MARACAS_SOURCE_DIR}/src/SnakeIsoContour+Deriche
-    src/interface/wxWindows
-    src/interface/wxWindows/Contour
-    src/interface/wxWindows/widgets
-    src/interface/wxWindows/widgets/pPlotter
-	src/interface/wxWindows/widgets/manualContour
-	src/interface/wxWindows/widgets/manualPaint
-	src/interface/wxWindows/widgets/ThresholdImageView
-	src/CutModule/interface
-	src/CutModule/kernel
-	../../../
 
-)
 	#message(jhcl\n\n ${crea_LIBRARIES})
 	#INCLUDE(include/Modules/MARACAS_Find_LIBIDO.cmake)
 	#SET(CREA_LIBRARIES C:/creaBin/Debug/crea.lib)
@@ -81,6 +62,9 @@ IF ( BUILD_${LIBRARY_NAME} )
   FILE(GLOB ${LIBRARY_NAME}_HEADERS_KERNEL "src/kernel/*.h")
   FILE(GLOB ${LIBRARY_NAME}_SOURCES_KERNEL src/kernel/*.cxx src/kernel/*.cpp src/kernel/*.cc)
 
+FILE(GLOB ${LIBRARY_NAME}_HEADERS_CUTMODULE src/CutModule/interface/*.h src/CutModule/kernel/*.h)
+  FILE(GLOB ${LIBRARY_NAME}_SOURCES_CUTMODULE src/CutModule/interface/*.cxx src/CutModule/kernel/*.cxx)
+
 
   SET ( ${LIBRARY_NAME}_HEADERS
   	${${LIBRARY_NAME}_HEADERS_WXWIN}
@@ -92,6 +76,7 @@ IF ( BUILD_${LIBRARY_NAME} )
     	${${LIBRARY_NAME}_HEADERS_MANUAL_PAINT}
     	include/matrix.h
 	${${LIBRARY_NAME}_HEADERS_KERNEL}
+	${${LIBRARY_NAME}_HEADERS_CUTMODULE}
   )
   #----------------------------------------------------------------------------
 
@@ -110,6 +95,7 @@ IF ( BUILD_${LIBRARY_NAME} )
 	${${LIBRARY_NAME}_SOURCES_MANUAL_CONTOUR}
 	${${LIBRARY_NAME}_SOURCES_MANUAL_PAINT}
 	${${LIBRARY_NAME}_SOURCES_KERNEL}
+	${${LIBRARY_NAME}_SOURCES_CUTMODULE}
   )
   #----------------------------------------------------------------------------
 #jhcl-Start===========================================================================
@@ -131,7 +117,7 @@ IF ( BUILD_${LIBRARY_NAME} )
 		${CREA_LIBRARIES}
 	#${BOOST_LIBRARIES}
 	#jhcl-End===========================================================================
-		creaMaracasVisu_CutModule_interface
+		#creaMaracasVisu_CutModule_interface
     )
   #----------------------------------------------------------------------------
 
@@ -185,6 +171,8 @@ SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
 	lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView
 	lib/maracasVisuLib/../../../
 )
+
+
 IF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
   SET(CILFC_EXECUTABLE_OUTPUT_REL_PATH ".")
 ELSE ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )