]> Creatis software - bbtk.git/commitdiff
*** empty log message ***
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Mon, 12 Oct 2009 18:33:33 +0000 (18:33 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Mon, 12 Oct 2009 18:33:33 +0000 (18:33 +0000)
CMakeLists.txt
kernel/cmake/BBTKConfigurePackagePaths.cmake
kernel/cmake/BBTKFindLibraries.cmake
kernel/cmake/BBTKMacros.cmake

index 2d988cbfd810aee5d93fa90c682d94fb33ae2e67..1c1187598d4b4d56504a2ec033ad1c1f7e8b0c74 100644 (file)
@@ -8,7 +8,7 @@ PROJECT(BBTK)
 
 #-----------------------------------------------------------------------------
 # Set global configuration of the toolkit
-INCLUDE(kernel/cmake/BBTKRootCMakeLists.cmake)
+INCLUDE(kernel/cmake/BBTKRootCMakeLists.cmake NO_POLICY_SCOPE )
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
index 1cbcc9866390f0c5679ab84dd8743c247e533f0d..2ddfee14c94986b9c3bebf20e70e8658a6ed930a 100644 (file)
@@ -14,7 +14,7 @@ IF(WIN32)
     MESSAGE(FATAL_ERROR "bbi not found in ${BBTK_DIR}/bin ; ${BBTK_DIR}/Release ; ${BBTK_DIR}/Debug ; ${BBTK_DIR}/RelWithDebInfo : is bbtk properly built ?")
   ENDIF(NOT BBTK_BIN_PATH)
 
-  SET (ADDITIONAL_DLL_PATH "C:/Program Files/CreaTools/crea_ThirdParty_dlls-0.2.0/bin" CACHE PATH "Additional paths in which to look for dlls")
+##  SET (ADDITIONAL_DLL_PATH "C:/Program Files/CreaTools/crea_ThirdParty_dlls-0.2.0/bin" CACHE PATH "Additional paths in which to look for dlls")
 
   SET(BBTK_PACKAGE_LIB_PATH bin)
   SET(BBTK_BBI "${BBTK_BIN_PATH}/bbi")
index 3d822a38b2bc98d34983313402911406561f42c9..03db758f7780d669a85ba7c4e7ae1518f123ceca 100644 (file)
@@ -10,10 +10,10 @@ MESSAGE ( STATUS "")
 #-----------------------------------------------------------------------------
 # 11/12/08 : BBTK IS NOW BASED ON crea
 SET(CREA_VERBOSE_CMAKE TRUE)
-FIND_PACKAGE(crea REQUIRED)
+FIND_PACKAGE(crea REQUIRED )
 set(crea_BUILD_SETTINGS_FILE OFF)
 IF (crea_FOUND)
-  INCLUDE(${crea_USE_FILE})
+  INCLUDE(${crea_USE_FILE} )
 ENDIF(crea_FOUND)
 #-----------------------------------------------------------------------------
 
index 95d2b347553664fe4e778d7b398e56219e8aa52a..f6833d03f0f3a553a13336b4f3ea9a70cc7e3472 100644 (file)
@@ -55,6 +55,7 @@ MACRO(MAKE_DLL_PATH)
     ENDIF(USE_DOT)     
 #    SET(DLL_PATHA Path=${ADDITIONAL_DLL_PATH}__RR__%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH%__RR__${DOT_DIR})
     SET(DLL_PATHA ${ADDITIONAL_DLL_PATH}__RR__${DOT_DIR}__RR__)
+               
     FOREACH(APATH $ENV{PATH})
          SET(DLL_PATHA ${DLL_PATHA}__RR__${APATH})
     ENDFOREACH(APATH)