include cutModule in creaMaracasVisulib, include files in install

diff --git a/bbtk/CMakeLists.txt b/bbtk/CMakeLists.txt
index 90d1c47688891b90acdbaf63c39bf7475fe1c6b0..1f6a43281ad16afe2b40a041b28631ed810308a7 100644 (file)
--- a/bbtk/CMakeLists.txt
+++ b/bbtk/CMakeLists.txt
@@ -364,8 +364,8 @@ SET(${BBTK_PACKAGE_NAME}_LIBS
   # EXCEPT : the same libs than for INCLUDE_DIRS 
 ###  ${MYSQL_LIBRARIES}
   creaMaracasVisu
-  creaMaracasVisu_CutModule_interface
-  creaMaracasVisu_CutModule_kernel
+  #creaMaracasVisu_CutModule_interface
+  #creaMaracasVisu_CutModule_kernel
 ###  ILPDModel.lib
 ###  ILPDInterface
 ###  ILPDcontrolerInterface

diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index f6de5871e6e0a3c132ae6bb07247bc1fff322dd1..4e6fee64eddcefec5ad5d481d3b3c0824c16eacb 100644 (file)
--- a/lib/maracasVisuLib/CMakeLists.txt
+++ b/lib/maracasVisuLib/CMakeLists.txt
@@ -62,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}
@@ -73,6 +76,7 @@ IF ( BUILD_${LIBRARY_NAME} )
        ${${LIBRARY_NAME}_HEADERS_MANUAL_PAINT}
        include/matrix.h
        ${${LIBRARY_NAME}_HEADERS_KERNEL}
+       ${${LIBRARY_NAME}_HEADERS_CUTMODULE}
   )
   #----------------------------------------------------------------------------
 
@@ -91,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===========================================================================
@@ -112,7 +117,7 @@ IF ( BUILD_${LIBRARY_NAME} )
                ${CREA_LIBRARIES}
        #${BOOST_LIBRARIES}
        #jhcl-End===========================================================================
-               creaMaracasVisu_CutModule_interface
+               #creaMaracasVisu_CutModule_interface
     )
   #----------------------------------------------------------------------------
 

diff --git a/lib/maracasVisuLib/src/CMakeLists.txt b/lib/maracasVisuLib/src/CMakeLists.txt
index fab325632368a99cd1b0d42133aefeb02c4bc090..984c668df23ebb84ade36e4e65e2a75137619983 100644 (file)
--- a/lib/maracasVisuLib/src/CMakeLists.txt
+++ b/lib/maracasVisuLib/src/CMakeLists.txt
@@ -1,2 +1,2 @@
-ADD_SUBDIRECTORY(CutModule)
+#ADD_SUBDIRECTORY(CutModule)