From e012f7ccd4641a95bb63fb169926b00082cc4b17 Mon Sep 17 00:00:00 2001 From: Juan Prieto Date: Fri, 4 Feb 2011 15:59:21 +0000 Subject: [PATCH] include cutModule in creaMaracasVisulib, include files in install --- bbtk/CMakeLists.txt | 4 ++-- lib/maracasVisuLib/CMakeLists.txt | 7 ++++++- lib/maracasVisuLib/src/CMakeLists.txt | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/bbtk/CMakeLists.txt b/bbtk/CMakeLists.txt index 90d1c47..1f6a432 100644 --- 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 f6de587..4e6fee6 100644 --- 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 fab3256..984c668 100644 --- a/lib/maracasVisuLib/src/CMakeLists.txt +++ b/lib/maracasVisuLib/src/CMakeLists.txt @@ -1,2 +1,2 @@ -ADD_SUBDIRECTORY(CutModule) +#ADD_SUBDIRECTORY(CutModule) -- 2.45.2