X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKMacros.cmake;h=904285cf6851e332f946e991eb9e1af31612fa96;hb=0391cd0cbb90e513fdc877a6eed61534b28f70ff;hp=3cfa5f4a13e7dcf98d12c13226175eff820e7de0;hpb=7785d9f3ee33f106ad64a204d8cef883185180b0;p=bbtk.git

diff --git a/kernel/cmake/BBTKMacros.cmake b/kernel/cmake/BBTKMacros.cmake
index 3cfa5f4..904285c 100644
--- a/kernel/cmake/BBTKMacros.cmake
+++ b/kernel/cmake/BBTKMacros.cmake
@@ -39,6 +39,7 @@ ENDMACRO(ADD_DEF_WITH_VAL)
 # FROM SOURCE TREE TO DOC BUILD TREE
 # AND INSTALL THEM IN BBTK DOC TREE
 MACRO(BBTK_DOC_INSTALL_IMAGES DOC_RELATIVE_INSTALL_PATH)
+  MESSAGE(STATUS "* Copying png,jpg,tif images in ${BBTK_DOC_BUILD_PATH}/${DOC_RELATIVE_INSTALL_PATH}")
   FILE(GLOB PNG_IMAGES "*.png")
   FILE(GLOB JPG_IMAGES "*.jpg")
   FILE(GLOB TIF_IMAGES "*.tif")
@@ -86,18 +87,22 @@ ENDMACRO(MKDIR)
 #========================================================================
 MACRO(MAKE_DLL_PATH)
   IF(WIN32)
-   IF(NOT DLL_PATH)
     IF(USE_DOT)
-      FIND_PATH(DOT_DIR dot.exe PATHS $ENV{PATH} )
-      IF(NOT DOT_DIR)
-        MESSAGE(FATAL_ERROR "Dot not found : set DOT_DIR to the folder containing dot.exe")
-      ELSE(NOT DOT_DIR)
-        MESSAGE(STATUS "Looking for dot... - found in ${DOT_DIR}")
+      IF (NOT DOT_DIR)
+        FIND_PATH(DOT_DIR dot.exe PATHS $ENV{PATH} )
+        IF(NOT DOT_DIR)
+          MESSAGE(FATAL_ERROR "Dot not found : set DOT_DIR to the folder containing dot.exe")
+        ELSE(NOT DOT_DIR)
+          MESSAGE(STATUS "Looking for dot... - found in ${DOT_DIR}")
+         ENDIF(NOT DOT_DIR)
       ENDIF(NOT DOT_DIR)
     ENDIF(USE_DOT)	
-    SET(DLL_PATH0 Path=${ADDITIONAL_DLL_PATH}__RR__%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH%__RR__${DOT_DIR})
-    STRING(REPLACE "__RR__" "\;" DLL_PATH ${DLL_PATH0} )
-   ENDIF(NOT DLL_PATH)
+#    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)
+    STRING(REPLACE "__RR__" "\;" DLL_PATH ${DLL_PATHA} )
   ENDIF(WIN32)  
 ENDMACRO(MAKE_DLL_PATH)
 #========================================================================