*** empty log message ***

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 504a863700e83b74d06b024560b12559d0497458..3aabe42294d9449403744b2d5100f5dc186cf14f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,11 +47,25 @@ MARK_AS_ADVANCED(
 SET(CREAMARACASVISU_LIB_PATH ${CMAKE_CREA_LIB_PATH} )
 
 INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/data/Icons )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/include )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/kernel )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/Contour )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter )
+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 )
+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/../../../ )
+
 
 ADD_SUBDIRECTORY(install)
-#ADD_SUBDIRECTORY(appli)
 ADD_SUBDIRECTORY(lib)
 ADD_SUBDIRECTORY(bbtk)
+ADD_SUBDIRECTORY(appli)
 
 
 SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/data)

diff --git a/bbtk/CMakeLists.txt b/bbtk/CMakeLists.txt
index 9968a014a95203d4ca477f10dbcb9a12f7e3ae33..90d1c47688891b90acdbaf63c39bf7475fe1c6b0 100644 (file)
--- a/bbtk/CMakeLists.txt
+++ b/bbtk/CMakeLists.txt
@@ -122,23 +122,23 @@ SET(${BBTK_PACKAGE_NAME}_INCLUDE_DIRS
 #INCLUDE_DIRECTORIES(${LIBIDO_INCLUDE_PATH})
 
   #===========================================================================
-  INCLUDE_DIRECTORIES(
-    # LIST HERE YOUR ADDITIONAL INCLUDE DIRECTORIES (EXCEPT BBTK'S)
-       ../lib/maracasVisuLib/src/kernel
-       ../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/interface/wxWindows/widgets/manualPaint
-       ../lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView
-       ../lib/maracasVisuLib/src/CutModule/interface
-       ../lib/maracasVisuLib/src/CutModule/kernel
+#  INCLUDE_DIRECTORIES(
+#    # LIST HERE YOUR ADDITIONAL INCLUDE DIRECTORIES (EXCEPT BBTK'S)
+#      ../lib/maracasVisuLib/src/kernel
+#      ../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/interface/wxWindows/widgets/manualPaint
+#      ../lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView
+#      ../lib/maracasVisuLib/src/CutModule/interface
+#      ../lib/maracasVisuLib/src/CutModule/kernel
        
 ###    ${MaracasSrcDir}/ILPD/src/wxInterface
-    )
+#    )
   #===========================================================================
  
 #TODO for a nice VC++ we need to add header file...

diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index 9e220bd79f3bb1879bf6f503ce27bd9f03d7b2c1..f6de5871e6e0a3c132ae6bb07247bc1fff322dd1 100644 (file)
--- a/lib/maracasVisuLib/CMakeLists.txt
+++ b/lib/maracasVisuLib/CMakeLists.txt
@@ -26,26 +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/manualPaint
-       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)
@@ -185,6 +166,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} )