Diego Caceres: Changes in CMakeLists.txt.

my changes are into #DCH comentaries.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3001c64db6e7a330fd82d053426416023ae58fb8..06f8a721b189b170d7889dd33819ec6790abde41 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,6 +63,12 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWi
 INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour )
 INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint )
 INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView )
+#DCH
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/include )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/include )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/controller/include )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/include )
+#DCH
 INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/CutModule/interface )
 INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/CutModule/kernel )
 INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/../../../ )

diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index 4e6fee64eddcefec5ad5d481d3b3c0824c16eacb..949c166299061b1cedf57f2489039189186a2c54 100644 (file)
--- a/lib/maracasVisuLib/CMakeLists.txt
+++ b/lib/maracasVisuLib/CMakeLists.txt
@@ -53,6 +53,14 @@ 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/include/*.h" "src/interface/wxWindows/widgets/creaButtonContainer/view/include/*.h" "src/interface/wxWindows/widgets/creaButtonContainer/controller/include/*.h" )
+  FILE(GLOB ${LIBRARY_NAME}_SOURCES_CBUTTONCONTAINER src/interface/wxWindows/widgets/creaButtonContainer/model/src/*.cxx src/interface/wxWindows/widgets/creaButtonContainer/view/src/*.cxx src/interface/wxWindows/widgets/creaButtonContainer/controller/src/*.cxx )
+
+  FILE(GLOB ${LIBRARY_NAME}_HEADERS_CPBUTTONCONTAINER "src/interface/wxWindows/widgets/creaPanelButtonContainer/include/*.h" )
+  FILE(GLOB ${LIBRARY_NAME}_SOURCES_CPBUTTONCONTAINER src/interface/wxWindows/widgets/creaPanelButtonContainer/src/*.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 )
 
@@ -77,6 +85,9 @@ FILE(GLOB ${LIBRARY_NAME}_HEADERS_CUTMODULE src/CutModule/interface/*.h src/CutM
        include/matrix.h
        ${${LIBRARY_NAME}_HEADERS_KERNEL}
        ${${LIBRARY_NAME}_HEADERS_CUTMODULE}
+       ${${LIBRARY_NAME}_HEADERS_CBUTTONCONTAINER}
+       ${${LIBRARY_NAME}_HEADERS_CPBUTTONCONTAINER}
+       
   )
   #----------------------------------------------------------------------------
 
@@ -96,6 +107,8 @@ FILE(GLOB ${LIBRARY_NAME}_HEADERS_CUTMODULE src/CutModule/interface/*.h src/CutM
        ${${LIBRARY_NAME}_SOURCES_MANUAL_PAINT}
        ${${LIBRARY_NAME}_SOURCES_KERNEL}
        ${${LIBRARY_NAME}_SOURCES_CUTMODULE}
+       ${${LIBRARY_NAME}_SOURCES_CBUTTONCONTAINER}
+       ${${LIBRARY_NAME}_SOURCES_CPBUTTONCONTAINER}
   )
   #----------------------------------------------------------------------------
 #jhcl-Start===========================================================================