From: guigues Date: Fri, 21 Nov 2008 15:23:01 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: EED.02Oct2009~87 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=5844b74c6fe4f586454a7a118e0e101e4e58ab18;p=creaContours.git *** empty log message *** --- diff --git a/CMakeLists.txt b/CMakeLists.txt index f424a75..860cad4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,15 +20,15 @@ IF (crea_FOUND) INCLUDE(${crea_USE_FILE}) ENDIF(crea_FOUND) -FIND_PACKAGE(CreaEnvironment REQUIRED) -IF (CreaEnvironment_FOUND) - INCLUDE(${CreaEnvironment_USE_FILE}) -ENDIF(CreaEnvironment_FOUND) +FIND_PACKAGE(creaEnvironment REQUIRED) +IF (creaEnvironment_FOUND) + INCLUDE(${creaEnvironment_USE_FILE}) +ENDIF(creaEnvironment_FOUND) -FIND_PACKAGE(maracasVisuLib REQUIRED) -IF (maracasVisuLib_FOUND) - INCLUDE(${maracasVisuLib_USE_FILE}) -ENDIF(maracasVisuLib_FOUND) +FIND_PACKAGE(creaMaracasVisu REQUIRED) +IF (creaMaracasVisu_FOUND) + INCLUDE(${creaMaracasVisu_USE_FILE}) +ENDIF(creaMaracasVisu_FOUND) FIND_PACKAGE(creaImageIO REQUIRED) IF (creaImageIO_FOUND) diff --git a/appli/wxContourGUIExample/CMakeLists.txt b/appli/wxContourGUIExample/CMakeLists.txt index b466d61..a4d4ac4 100644 --- a/appli/wxContourGUIExample/CMakeLists.txt +++ b/appli/wxContourGUIExample/CMakeLists.txt @@ -14,11 +14,11 @@ TARGET_LINK_LIBRARIES( wxContourGUIExample Interface_ManagerContour_NDimensions_lib kernel_ManagerContour_NDimensions_lib - ${WXWIDGETS_LIBRARIES} +# ${WXWIDGETS_LIBRARIES} ${VTK_LIBRARIES} - ${CreaEnvironment_LIBRARIES} + ${creaEnvironment_LIBRARIES} ${creaImageIO_LIBRARIES} - ${maracasVisuLib_LIBRARIES} + ${creaMaracasVisu_LIBRARIES} # HORRROOOOR !!! # creaImageIO diff --git a/bbtk/CMakeLists.txt b/bbtk/CMakeLists.txt index 4b440a4..ea48f34 100644 --- a/bbtk/CMakeLists.txt +++ b/bbtk/CMakeLists.txt @@ -132,9 +132,9 @@ SET(${BBTK_PACKAGE_NAME}_LIBS Interface_ManagerContour_NDimensions_lib Interface_Icons_NDimensions_lib kernel_ManagerContour_NDimensions_lib - CreaEnvironment - maracasVisuLib - vtkImaging vtkGraphics vtkRendering vtkFiltering vtkCommon +# ${creaEnvironment_LIBRARIES} : already linked by above libs +# ${creaMaracasVisu_LIBRARIES} : already linked by above libs + ) #===========================================================================