X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2FCMakeLists.txt;h=80e2f18d960a7cb20179f128a8a0a959b7f70c9d;hb=4b092ee0b1bcda4d298e5ffc3b58b599e273db20;hp=21bd89863250ec206683040f18d9aa07b31feabd;hpb=f38984f56e3dbccb5d3a8392aa3e5cbb698bf2d8;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index 21bd898..80e2f18 100644
--- a/lib/maracasVisuLib/CMakeLists.txt
+++ b/lib/maracasVisuLib/CMakeLists.txt
@@ -26,25 +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/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)
@@ -71,12 +53,26 @@ IF ( BUILD_${LIBRARY_NAME} )
   FILE(GLOB ${LIBRARY_NAME}_HEADERS_PPLOTTER "src/interface/wxWindows/widgets/pPlotter/*.h")
   FILE(GLOB ${LIBRARY_NAME}_SOURCES_PPLOTTER src/interface/wxWindows/widgets/pPlotter/*.cxx src/interface/wxWindows/widgets/pPlotter/*.cpp src/interface/wxWindows/widgets/pPlotter/*.cc)
 
+#DCH
+  FILE(GLOB ${LIBRARY_NAME}_HEADERS_CBUTTONCONTAINER "src/interface/wxWindows/widgets/creaButtonContainer/model/*.h" "src/interface/wxWindows/widgets/creaButtonContainer/view/*.h" "src/interface/wxWindows/widgets/creaButtonContainer/controller/*.h" )
+  FILE(GLOB ${LIBRARY_NAME}_SOURCES_CBUTTONCONTAINER src/interface/wxWindows/widgets/creaButtonContainer/model/*.cxx src/interface/wxWindows/widgets/creaButtonContainer/view/*.cxx src/interface/wxWindows/widgets/creaButtonContainer/controller/*.cxx )
+
+  FILE(GLOB ${LIBRARY_NAME}_HEADERS_CPBUTTONCONTAINER "src/interface/wxWindows/widgets/creaPanelButtonContainer/*.h" )
+  FILE(GLOB ${LIBRARY_NAME}_SOURCES_CPBUTTONCONTAINER src/interface/wxWindows/widgets/creaPanelButtonContainer/*.cxx )  
+#DCH
+
   FILE(GLOB ${LIBRARY_NAME}_HEADERS_MANUAL_CONTOUR "src/interface/wxWindows/widgets/manualContour/*.h")
   FILE(GLOB ${LIBRARY_NAME}_SOURCES_MANUAL_CONTOUR src/interface/wxWindows/widgets/manualContour/*.cpp )
 
+  FILE(GLOB ${LIBRARY_NAME}_HEADERS_MANUAL_PAINT "src/interface/wxWindows/widgets/manualPaint/*.h")
+  FILE(GLOB ${LIBRARY_NAME}_SOURCES_MANUAL_PAINT src/interface/wxWindows/widgets/manualPaint/*.cpp )
+
   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}
@@ -85,8 +81,13 @@ IF ( BUILD_${LIBRARY_NAME} )
     	${${LIBRARY_NAME}_HEADERS_WIDGETS}
     	${${LIBRARY_NAME}_HEADERS_PPLOTTER}
     	${${LIBRARY_NAME}_HEADERS_MANUAL_CONTOUR}
+    	${${LIBRARY_NAME}_HEADERS_MANUAL_PAINT}
     	include/matrix.h
 	${${LIBRARY_NAME}_HEADERS_KERNEL}
+	${${LIBRARY_NAME}_HEADERS_CUTMODULE}
+	${${LIBRARY_NAME}_HEADERS_CBUTTONCONTAINER}
+	${${LIBRARY_NAME}_HEADERS_CPBUTTONCONTAINER}
+	
   )
   #----------------------------------------------------------------------------
 
@@ -103,7 +104,11 @@ IF ( BUILD_${LIBRARY_NAME} )
     	${${LIBRARY_NAME}_SOURCES_WIDGETS}
     	${${LIBRARY_NAME}_SOURCES_PPLOTTER}
 	${${LIBRARY_NAME}_SOURCES_MANUAL_CONTOUR}
+	${${LIBRARY_NAME}_SOURCES_MANUAL_PAINT}
 	${${LIBRARY_NAME}_SOURCES_KERNEL}
+	${${LIBRARY_NAME}_SOURCES_CUTMODULE}
+	${${LIBRARY_NAME}_SOURCES_CBUTTONCONTAINER}
+	${${LIBRARY_NAME}_SOURCES_CPBUTTONCONTAINER}
   )
   #----------------------------------------------------------------------------
 #jhcl-Start===========================================================================
@@ -125,7 +130,7 @@ IF ( BUILD_${LIBRARY_NAME} )
 		${CREA_LIBRARIES}
 	#${BOOST_LIBRARIES}
 	#jhcl-End===========================================================================
-		creaMaracasVisu_CutModule_interface
+		#creaMaracasVisu_CutModule_interface
     )
   #----------------------------------------------------------------------------
 
@@ -179,6 +184,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} )
@@ -189,12 +196,6 @@ ENDIF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
 
 IF(UNIX)
   SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
-message("EED cmakelist  creamaracasvisu -------------------------------")
-message("EED cmakelist  creamaracasvisu -------------------------------")
-message("EED cmakelist  creamaracasvisu -------------------------------")
-message("EED cmakelist  creamaracasvisu -------------------------------")
-message("EED cmakelist  creamaracasvisu -------------------------------")
-message("EED cmakelist  creamaracasvisu ${CREAMARACASVISU_LIB_PATH} -------------------------------")
   SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${CREAMARACASVISU_LIB_PATH} )
 ELSE(UNIX)
   SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS
@@ -233,4 +234,4 @@ ENDIF(WIN32)
   #---------------------------------------------------------------------------
 ENDIF ( BUILD_${LIBRARY_NAME} )
 
-SUBDIRS(src)
+ADD_SUBDIRECTORY(src)