X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKMacros.cmake;h=f6833d03f0f3a553a13336b4f3ea9a70cc7e3472;hb=63d56e2f28b834d9e13f3757aaa23ab63b2b3dd6;hp=d8719033d3b9f4eb376353704b6b9369e908512d;hpb=b838e74e8b1e67f28442e6394f9220f41a7d546a;p=bbtk.git

diff --git a/kernel/cmake/BBTKMacros.cmake b/kernel/cmake/BBTKMacros.cmake
index d871903..f6833d0 100644
--- a/kernel/cmake/BBTKMacros.cmake
+++ b/kernel/cmake/BBTKMacros.cmake
@@ -1,44 +1,10 @@
 
-#-----------------------------------------------------------------------------
-# MACRO TO ADD A COMPILER DEFINITION WHICH ADDS ALSO THE DEF 
-# INTO DOXYGEN PREDEFINED VAR 
-# (OTHERWISE DOXYGEN WOULD NOT PARSE THE FILES BLOCKED)
-MACRO(ADD_DEF DEF)
-  MESSAGE(STATUS "* Added definition -D${DEF}")
-  ADD_DEFINITIONS( -D${DEF} )
-  SET(DOXYGEN_DOC_PREDEFINED 
-    ${DOXYGEN_DOC_PREDEFINED};${DEF}
-    CACHE 
-    STRING 
-    ""
-    FORCE)
-  MARK_AS_ADVANCED(DOXYGEN_DOC_PREDEFINED)
-ENDMACRO(ADD_DEF)
-#-----------------------------------------------------------------------------
-
-#-----------------------------------------------------------------------------
-# MACRO TO ADD A COMPILER DEFINITION WITH VALUE WHICH ADDS ALSO THE DEF 
-# INTO DOXYGEN PREDEFINED VAR 
-# (OTHERWISE DOXYGEN WOULD NOT PARSE THE FILES BLOCKED)
-MACRO(ADD_DEF_WITH_VAL DEF VAL)
-  MESSAGE(STATUS "* Added definition -D${DEF}=${VAL}")
-  ADD_DEFINITIONS( -D${DEF}=${VAL} )
-  SET(DOXYGEN_DOC_PREDEFINED 
-    ${DOXYGEN_DOC_PREDEFINED};${DEF}=${VAL}
-    CACHE 
-    STRING 
-    ""
-    FORCE)
-  MARK_AS_ADVANCED(DOXYGEN_DOC_PREDEFINED)
-ENDMACRO(ADD_DEF_WITH_VAL)
-#-----------------------------------------------------------------------------
-
-
 #========================================================================
 # MACRO WHICH COPIES ALL IMAGES (png, jpg, gif) 
 # 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")
@@ -72,15 +38,6 @@ MACRO(BBTK_DOC_INSTALL_IMAGES 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)
-#========================================================================
 
 
 #========================================================================
@@ -97,7 +54,8 @@ MACRO(MAKE_DLL_PATH)
       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 Path=${ADDITIONAL_DLL_PATH}__RR__)
+    SET(DLL_PATHA ${ADDITIONAL_DLL_PATH}__RR__${DOT_DIR}__RR__)
+		
     FOREACH(APATH $ENV{PATH})
 	  SET(DLL_PATHA ${DLL_PATHA}__RR__${APATH})
     ENDFOREACH(APATH)