X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKMacros.cmake;h=3c2cf0e3b36d6b1327f20b53003f326930c7720c;hb=cf155931d4fded21cd2aaaeb0f3ead82067d2bef;hp=0f832e5ef07d19cb82950a91151d73b7534e30d1;hpb=aeafe748c859675cf481bd9e5e5a5afa84a3fa52;p=bbtk.git

diff --git a/kernel/cmake/BBTKMacros.cmake b/kernel/cmake/BBTKMacros.cmake
index 0f832e5..3c2cf0e 100644
--- a/kernel/cmake/BBTKMacros.cmake
+++ b/kernel/cmake/BBTKMacros.cmake
@@ -39,34 +39,69 @@ 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)
-  FILE(GLOB PNG_IMAGES "." "*.png")
-  FILE(GLOB JPG_IMAGES "." "*.jpg")
-  FILE(GLOB TIF_IMAGES "." "*.tif")
+  FILE(GLOB PNG_IMAGES "*.png")
+  FILE(GLOB JPG_IMAGES "*.jpg")
+  FILE(GLOB TIF_IMAGES "*.tif")
   SET(IMAGES
     ${PNG_IMAGES}
     ${JPG_IMAGES}
     ${TIF_IMAGES}
     )
- #   MESSAGE(ERROR ${IMAGES})
+#    MESSAGE(ERROR ${IMAGES} )
   FOREACH(image ${IMAGES})  
     GET_FILENAME_COMPONENT(filename "${image}" NAME)
     CONFIGURE_FILE(
       ${image}
-       ${PROJECT_BINARY_DIR}/${BBTK_DOC_INSTALL_PATH}/${DOC_RELATIVE_INSTALL_PATH}/${filename}
+       ${BBTK_DOC_BUILD_PATH}/${DOC_RELATIVE_INSTALL_PATH}/${filename}
       COPYONLY
       ) 
-      IF (WIN32)
-	CONFIGURE_FILE(
-          ${image}
-          ${CMAKE_CURRENT_BINARY_DIR}/${filename}
-          COPYONLY
-	  )
-      ENDIF(WIN32)
+      
+    #  IF (WIN32)
+#	CONFIGURE_FILE(
+#          ${image}
+#          ${CMAKE_CURRENT_BINARY_DIR}/${filename}
+#          COPYONLY
+#	  )
+#      ENDIF(WIN32)
     # MESSAGE(ERROR "${image} (${filename}) in :  ${PROJECT_BINARY_DIR}/${BBTK_DOC_INSTALL_PATH}/${DOC_RELATIVE_INSTALL_PATH}/${filename}")
   ENDFOREACH(image)
   INSTALL( 
       FILES ${IMAGES} 
-      DESTINATION ${CMAKE_INSTALL_PREFIX}/${BBTK_DOC_INSTALL_PATH}/${DOC_RELATIVE_INSTALL_PATH}
+      DESTINATION ${BBTK_DOC_INSTALL_PATH}/${DOC_RELATIVE_INSTALL_PATH}
     )  
 ENDMACRO(BBTK_DOC_INSTALL_IMAGES)
 #========================================================================
+
+#========================================================================
+# Creates a directory if it does not exist
+MACRO(MKDIR DIR)
+  IF(NOT IS_DIRECTORY ${DIR})
+    MESSAGE(STATUS "* Creating directory '${DIR}'")
+    FILE(MAKE_DIRECTORY ${DIR})
+  ENDIF(NOT IS_DIRECTORY ${DIR})
+ENDMACRO(MKDIR)
+#========================================================================
+
+
+#========================================================================
+MACRO(MAKE_DLL_PATH)
+  IF(WIN32)
+    IF(USE_DOT)
+      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_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)
+#========================================================================