From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Mon, 12 Oct 2009 18:33:33 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CREATOOLS.2-0-3~125
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=63d56e2f28b834d9e13f3757aaa23ab63b2b3dd6;p=bbtk.git

*** empty log message ***
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d988cb..1c11875 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 )
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
diff --git a/kernel/cmake/BBTKConfigurePackagePaths.cmake b/kernel/cmake/BBTKConfigurePackagePaths.cmake
index 1cbcc98..2ddfee1 100644
--- a/kernel/cmake/BBTKConfigurePackagePaths.cmake
+++ b/kernel/cmake/BBTKConfigurePackagePaths.cmake
@@ -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")
diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake
index 3d822a3..03db758 100644
--- a/kernel/cmake/BBTKFindLibraries.cmake
+++ b/kernel/cmake/BBTKFindLibraries.cmake
@@ -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)
 #-----------------------------------------------------------------------------
 
diff --git a/kernel/cmake/BBTKMacros.cmake b/kernel/cmake/BBTKMacros.cmake
index 95d2b34..f6833d0 100644
--- a/kernel/cmake/BBTKMacros.cmake
+++ b/kernel/cmake/BBTKMacros.cmake
@@ -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)