From: Eduardo Davila Date: Sat, 6 Dec 2008 15:14:43 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: EED.02Oct2009~82 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1105d4fa1829853319070b3d5144eec7e12b246b;p=creaContours.git *** empty log message *** --- diff --git a/CMakeLists.txt b/CMakeLists.txt index d52fad9..74700d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,28 +15,24 @@ SET(PROJECT_BUILD_VERSION 0) SET(CREA_VERBOSE_CMAKE TRUE) -message("EED creaContour " "01") FIND_PACKAGE(crea REQUIRED) IF (crea_FOUND) INCLUDE(${crea_USE_FILE}) ENDIF(crea_FOUND) -message("EED creaContour " "02") FIND_PACKAGE(creaEnvironment REQUIRED) IF (creaEnvironment_FOUND) INCLUDE(${creaEnvironment_USE_FILE}) ENDIF(creaEnvironment_FOUND) -message("EED creaContour " "03") FIND_PACKAGE(creaMaracasVisu REQUIRED) IF (creaMaracasVisu_FOUND) INCLUDE(${creaMaracasVisu_USE_FILE}) ENDIF(creaMaracasVisu_FOUND) -message("EED creaContour " "04") FIND_PACKAGE(creaImageIO REQUIRED) IF (creaImageIO_FOUND) @@ -44,7 +40,6 @@ IF (creaImageIO_FOUND) ENDIF(creaImageIO_FOUND) -message("EED creaContour " "05") SET(USE_GDCM OFF) @@ -54,9 +49,7 @@ SET(USE_VTK ON) SET(USE_ITK OFF) SET(USE_BOOST OFF) -message("EED creaContour " "05.1") CREA_FIND_AND_USE_LIBRARIES() -message("EED creaContour " "05.2") SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}) SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}) @@ -71,13 +64,11 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32) LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32) ENDIF(WIN32) -message("EED creaContour " "06") INCLUDE_DIRECTORIES(lib/Interface_ManagerContour_NDimensions) INCLUDE_DIRECTORIES(lib/Interface_Icons_NDimensions) INCLUDE_DIRECTORIES(lib/kernel_ManagerContour_NDimensions) -message("EED creaContour " "07") SUBDIRS(lib) SUBDIRS(appli) diff --git a/bbtk/CMakeLists.txt b/bbtk/CMakeLists.txt index 850d3a4..247713a 100644 --- a/bbtk/CMakeLists.txt +++ b/bbtk/CMakeLists.txt @@ -17,7 +17,7 @@ SET(BBTK_PACKAGE_NAME creaContours) #=========================================================================== # PACKAGE AUTHOR # !!! NO COMMA ALLOWED !!! -SET(${BBTK_PACKAGE_NAME}_AUTHOR "car-prie@uniandes.edu.co") +SET(${BBTK_PACKAGE_NAME}_AUTHOR "InfoTeam CREATIS-LRMN") #=========================================================================== #=========================================================================== diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h index 5f2ad32..706382b 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h +++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h @@ -30,7 +30,7 @@ #include "KernelManagerContour.h" #include "ContourWorkspace.h" -#include "contour/contourextractdata.h" +#include "ContourExtractData.h" diff --git a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h index 2876a87..ec6cd21 100644 --- a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h +++ b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h @@ -13,7 +13,7 @@ #include "OutlineModelManager.h" #include "OutlineModelBuilder.h" -#include "Contour/ContourPropagation.h" +#include "ContourPropagation.h" class KernelManagerContour{