Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/bbtk

[bbtk.git] / kernel / cmake / BBTKMacros.cmake

diff --git a/kernel/cmake/BBTKMacros.cmake b/kernel/cmake/BBTKMacros.cmake
index d8719033d3b9f4eb376353704b6b9369e908512d..8b1c2ae0f58bb5515725f0b47dff38eaa0d79c03 100644 (file)
--- a/kernel/cmake/BBTKMacros.cmake
+++ b/kernel/cmake/BBTKMacros.cmake
@@ -1,37 +1,28 @@
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
 
-#-----------------------------------------------------------------------------
-# 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)
-#-----------------------------------------------------------------------------
 
 
 #========================================================================
@@ -39,6 +30,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")
@@ -72,15 +64,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 +80,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)