X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FAdditionalBBTKConfig.cmake.in;h=37c5279268df53a20508330d212e76aef134fbd9;hb=d7e710c3fe8bd9c8c5fb79073bd5667b24c048f8;hp=d1fd674c974f9dd4b6e2197d6c43e9694e88287b;hpb=eff31c9c138fc259e544e509657e29c0d9cf1d3c;p=bbtk.git

diff --git a/kernel/cmake/AdditionalBBTKConfig.cmake.in b/kernel/cmake/AdditionalBBTKConfig.cmake.in
index d1fd674..37c5279 100644
--- a/kernel/cmake/AdditionalBBTKConfig.cmake.in
+++ b/kernel/cmake/AdditionalBBTKConfig.cmake.in
@@ -6,9 +6,11 @@ SET(BBTK_COMPILE_DEBUG_MESSAGES @BBTK_COMPILE_DEBUG_MESSAGES@)
 SET(BBTK_COMPILE_WARNING_MESSAGES @BBTK_COMPILE_WARNING_MESSAGES@)
 SET(BBTK_COMPILE_ERROR_MESSAGES @BBTK_COMPILE_ERROR_MESSAGES@)
 #-----------------------------------------------------------------------------
+SET(BBTK_BIN_REL_PATH @BBTK_BIN_REL_PATH@)
 SET(BBTK_SHARE_REL_PATH @BBTK_SHARE_REL_PATH@)
 SET(BBTK_DOC_REL_PATH @BBTK_DOC_REL_PATH@)
 SET(BBTK_BBS_REL_PATH @BBTK_BBS_REL_PATH@)
+SET(BBTK_DATA_REL_PATH @BBTK_DATA_REL_PATH@)
 SET(BBTK_CMAKE_REL_PATH @BBTK_CMAKE_REL_PATH@)
 SET(BBTK_CMAKE_DIR ${BBTK_DIR}/${BBTK_CMAKE_REL_PATH})
 #-----------------------------------------------------------------------------
@@ -19,14 +21,26 @@ IF(FIND_PACKAGE_VERBOSE)
   MESSAGE(STATUS "* BBTK_COMPILE_WARNING_MESSAGES = ${BBTK_COMPILE_WARNING_MESSAGES}")
   MESSAGE(STATUS "* BBTK_COMPILE_ERROR_MESSAGES   = ${BBTK_COMPILE_ERROR_MESSAGES}")
   MESSAGE(STATUS "* BBTK_COMPILE_DEBUG_MESSAGES   = ${BBTK_COMPILE_DEBUG_MESSAGES}")
+  MESSAGE(STATUS "* BBTK_BIN_REL_PATH             = ${BBTK_BIN_REL_PATH}")  
   MESSAGE(STATUS "* BBTK_SHARE_REL_PATH           = ${BBTK_SHARE_REL_PATH}")  
   MESSAGE(STATUS "* BBTK_DOC_REL_PATH             = ${BBTK_DOC_REL_PATH}")  
   MESSAGE(STATUS "* BBTK_BBS_REL_PATH             = ${BBTK_BBS_REL_PATH}")
+  MESSAGE(STATUS "* BBTK_DATA_REL_PATH            = ${BBTK_DATA_REL_PATH}")
   MESSAGE(STATUS "* BBTK_CMAKE_REL_PATH           = ${BBTK_CMAKE_REL_PATH}")
 ENDIF(FIND_PACKAGE_VERBOSE)
 
+
+SET(CREA_VERBOSE_CMAKE TRUE)
+IF (NOT crea_FOUND)
+FIND_PACKAGE(crea REQUIRED)
+IF (crea_FOUND)
+  INCLUDE(${crea_USE_FILE})
+ENDIF(crea_FOUND)
+ENDIF(NOT crea_FOUND)
+
+
 # If bbtk was compiled with WxWidget then have to find it
 IF(BBTK_BUILT_WITH_WX)
-  INCLUDE(${BBTK_CMAKE_DIR}/BBTKWxWidgets.cmake)
-  BBTK_FIND_WXWIDGETS()
+  INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseWxWidgets.cmake)
+  CREA_FIND_WXWIDGETS()
 ENDIF(BBTK_BUILT_WITH_WX)