X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2FCMakeLists.txt;h=8ef6dbc400931fc4ea31432f87f1369cf514e63f;hb=63b453426272f66364dcd0b6c6a5b5b3d4b715f3;hp=d475b0321126f52a59a788548c818501c973ce50;hpb=44e4be7013ea566bd2bdefb9d48e1da0071c3d91;p=creaMaracasVisu.git

diff --git a/bbtk/CMakeLists.txt b/bbtk/CMakeLists.txt
index d475b03..8ef6dbc 100644
--- a/bbtk/CMakeLists.txt
+++ b/bbtk/CMakeLists.txt
@@ -2,14 +2,13 @@
 INCLUDE_REGULAR_EXPRESSION("^.*$")
 set(CMAKE_MFC_FLAG 2)
 
-
 #===========================================================================
 # CMAKE SETTINGS FOR BUILDING A BBTK PACKAGE
 #===========================================================================
 
 #===========================================================================
 # THE NAME OF THE BBTK PACKAGE
-SET(BBTK_PACKAGE_NAME maracasvisu)
+SET(BBTK_PACKAGE_NAME creaMaracasVisu)
 #===========================================================================
 
 
@@ -27,7 +26,7 @@ SET(${BBTK_PACKAGE_NAME}_AUTHOR "eduardo.davila [at] creatis.insa-lyon.fr")
 
 #===========================================================================
 # PACKAGE DESCRIPTION
-SET(${BBTK_PACKAGE_NAME}_DESCRIPTION "Maracas library")
+SET(${BBTK_PACKAGE_NAME}_DESCRIPTION "Maracas library. LG : what does it provide ?")
 #===========================================================================
 
 #===========================================================================
@@ -42,7 +41,7 @@ SET(${BBTK_PACKAGE_NAME}_BUILD_VERSION 0)
 # UNCOMMENT EACH LIBRARY NEEDED (WILL BE FOUND AND USED AUTOMATICALLY)
  SET(${BBTK_PACKAGE_NAME}_USE_VTK  ON)
  SET(${BBTK_PACKAGE_NAME}_USE_ITK  ON)
- SET(${BBTK_PACKAGE_NAME}_USE_GDCM ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM ON)
 # SET(${BBTK_PACKAGE_NAME}_USE_GSMIS ON)
  SET(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS ON)
 #===========================================================================
@@ -118,9 +117,9 @@ SET(${BBTK_PACKAGE_NAME}_INCLUDE_DIRS
   )
 #===========================================================================
 
-FIND_PATH( libIdo_DIR libidobin $ENV{LIBIDO_PATH} )
-FIND_PACKAGE(libIdo)
-INCLUDE_DIRECTORIES(${LIBIDO_INCLUDE_PATH})
+#FIND_PATH( libIdo_DIR libidobin $ENV{LIBIDO_PATH} )
+#FIND_PACKAGE(libIdo)
+#INCLUDE_DIRECTORIES(${LIBIDO_INCLUDE_PATH})
 
   #===========================================================================
   INCLUDE_DIRECTORIES(
@@ -129,8 +128,13 @@ INCLUDE_DIRECTORIES(${LIBIDO_INCLUDE_PATH})
 	../lib/maracasVisuLib/include
     ../lib/maracasVisuLib/src/kernel
 	../lib/maracasVisuLib/src/interface/wxWindows
+	../lib/maracasVisuLib/src/interface/wxWindows/Contour
 	../lib/maracasVisuLib/src/interface/wxWindows/widgets
 	../lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter
+	../lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour
+	../lib/maracasVisuLib/src/CutModule/interface
+	../lib/maracasVisuLib/src/CutModule/kernel
+	
 ###    ${MaracasSrcDir}/ILPD/src/wxInterface
     )
   #===========================================================================
@@ -357,7 +361,9 @@ SET(${BBTK_PACKAGE_NAME}_LIBS
   # LIST HERE THE ADDITIONAL LIBS TO LINK AGAINST
   # EXCEPT : the same libs than for INCLUDE_DIRS 
 ###  ${MYSQL_LIBRARIES}
-  maracasVisuLib
+  creaMaracasVisu
+  creaMaracasVisu_CutModule_interface
+  creaMaracasVisu_CutModule_kernel
 ###  ILPDModel.lib
 ###  ILPDInterface
 ###  ILPDcontrolerInterface