From: Eduardo Davila Date: Fri, 6 Apr 2012 14:54:40 +0000 (+0000) Subject: no message X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=4fbe6f0c127ceafc78b91fd8ff6182acbc44f1ae;p=creaRigidRegistration.git no message --- diff --git a/CMakeLists.txt b/CMakeLists.txt index b6d5746..6b90161 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,14 +39,6 @@ IF (crea_FOUND) ENDIF(crea_FOUND) #================================== -#================================== -# Find creaMaracasVisu (to use the lib) -#FIND_PACKAGE(creaMaracasVisu REQUIRED) -#IF (creaMaracasVisu_FOUND) - #INCLUDE(${creaMaracasVisu_USE_FILE}) -#ENDIF(creaMaracasVisu_FOUND) -#================================== - #================================== # Do not allow to build inside the source tree CREA_PREVENT_IN_SOURCE_BUILD() @@ -83,6 +75,20 @@ SET(USE_TTH OFF) CREA_FIND_AND_USE_LIBRARIES() #================================== + + +#================================== +# Find creaMaracasVisu (to use the lib) +#FIND_PACKAGE(creaMaracasVisu REQUIRED) +#IF (creaMaracasVisu_FOUND) + #INCLUDE(${creaMaracasVisu_USE_FILE}) +#ENDIF(creaMaracasVisu_FOUND) +#================================== + + + + + #================================== # Where to put executables and libs SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}) diff --git a/PackRecalage/CMakeLists.txt b/PackRecalage/CMakeLists.txt index 940b7ed..092f22c 100644 --- a/PackRecalage/CMakeLists.txt +++ b/PackRecalage/CMakeLists.txt @@ -122,8 +122,10 @@ SET(${BBTK_PACKAGE_NAME}_INCLUDE_DIRS SET(${BBTK_PACKAGE_NAME}_LIBS # LIST HERE THE ADDITIONAL LIBS TO LINK AGAINST # EXCEPT : the same libs than for INCLUDE_DIRS + + ${WXWIDGETS_LIBRARIES} TransformLib - #${creaMaracasVisu_LIBRARIES} + ) #=========================================================================== diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index d83201d..a210759 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -52,7 +52,7 @@ IF ( BUILD_${LIBRARY_NAME} ) # SET ( ${LIBRARY_NAME}_LINK_LIBRARIES # ${crea_LIBRARIES} - ${WXWIDGETS_LIBRARIES} +# ${WXWIDGETS_LIBRARIES} # ${KWWidgets_LIBRARIES} ${VTK_LIBRARIES} # ${ITK_LIBRARIES}