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

diff --git a/kernel/cmake/BBTKMacros.cmake b/kernel/cmake/BBTKMacros.cmake
index 0f832e5..b5396fe 100644
--- a/kernel/cmake/BBTKMacros.cmake
+++ b/kernel/cmake/BBTKMacros.cmake
@@ -39,9 +39,9 @@ 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}
@@ -52,21 +52,31 @@ MACRO(BBTK_DOC_INSTALL_IMAGES DOC_RELATIVE_INSTALL_PATH)
     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)
+#========================================================================