Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / buildtools / Cmake / MaintainerMode.cmake

diff --git a/buildtools/Cmake/MaintainerMode.cmake b/buildtools/Cmake/MaintainerMode.cmake
index e5a941d..3aaaaae 100644 (file)
--- a/buildtools/Cmake/MaintainerMode.cmake
+++ b/buildtools/Cmake/MaintainerMode.cmake
@@ -21,14 +21,14 @@ IF(FLEXML_EXE)
        string(REGEX MATCH "[0-9]*$" FLEXML_MINOR_VERSION "${FLEXML_VERSION}")
 ENDIF(FLEXML_EXE)
 
-message("-- Found flex: ${FLEX_EXE}")
-message("-- Found flexml: ${FLEXML_EXE}")
-message("-- Found sed: ${SED_EXE}")
+message(STATUS "Found flex: ${FLEX_EXE}")
+message(STATUS "Found flexml: ${FLEXML_EXE}")
+message(STATUS "Found sed: ${SED_EXE}")
 
 if(HAVE_FLEXML AND HAVE_FLEX AND SED_EXE)
 
-message("-- Flex version: ${FLEX_MAJOR_VERSION}.${FLEX_MINOR_VERSION}.${FLEX_PATCH_VERSION}")
-message("-- Flexml version: ${FLEXML_MAJOR_VERSION}.${FLEXML_MINOR_VERSION}")
+message(STATUS "Flex version: ${FLEX_MAJOR_VERSION}.${FLEX_MINOR_VERSION}.${FLEX_PATCH_VERSION}")
+message(STATUS "Flexml version: ${FLEXML_MAJOR_VERSION}.${FLEXML_MINOR_VERSION}")
 
 set(string1  "'s/extern  *\\([^ ]*[ \\*]*\\)/XBT_PUBLIC_DATA(\\1) /'")
 set(string2  "'s/XBT_PUBLIC_DATA(\\([^)]*\\)) *\\([^(]*\\)(/XBT_PUBLIC(\\1) \\2(/'")
@@ -57,7 +57,7 @@ ADD_CUSTOM_COMMAND(
                        ${CMAKE_HOME_DIRECTORY}/src/simdag/dax.dtd
                                        
        #${CMAKE_HOME_DIRECTORY}/src/surf/simgrid_dtd.l: ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid.dtd
-       COMMAND ${FLEXML_EXE} --root-tags platform -b 1000000 -P surfxml --sysid=simgrid.dtd -S src/surf/simgrid_dtd.l -L src/surf/simgrid.dtd
+       COMMAND ${FLEXML_EXE} --root-tags platform -b 1000000 -P surfxml --sysid=http://simgrid.gforge.inria.fr/simgrid.dtd -S src/surf/simgrid_dtd.l -L src/surf/simgrid.dtd
        COMMAND ${CMAKE_COMMAND} -E echo "src/surf/simgrid_dtd.l"
        #${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.l: ${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.dtd
        COMMAND ${FLEXML_EXE} -b 1000000 -P graphxml --sysid=graphxml.dtd -S src/xbt/graphxml.l -L src/xbt/graphxml.dtd
@@ -69,7 +69,7 @@ ADD_CUSTOM_COMMAND(
        
        #${CMAKE_HOME_DIRECTORY}/include/surf/simgrid_dtd.h: ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid.dtd
        COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/include/surf/simgrid.h
-       COMMAND ${FLEXML_EXE} --root-tags platform -P surfxml --sysid=simgrid.dtd -H include/surf/simgrid_dtd.h -L src/surf/simgrid.dtd
+       COMMAND ${FLEXML_EXE} --root-tags platform -P surfxml --sysid=http://simgrid.gforge.inria.fr/simgrid.dtd -H include/surf/simgrid_dtd.h -L src/surf/simgrid.dtd
        COMMAND ${SED_EXE} -i ${string1} include/surf/simgrid_dtd.h
        COMMAND ${SED_EXE} -i ${string2} include/surf/simgrid_dtd.h     
        COMMAND ${CMAKE_COMMAND} -E echo "include/surf/simgrid_dtd.h"
@@ -124,16 +124,16 @@ ADD_CUSTOM_COMMAND(
 
 else(HAVE_FLEXML AND HAVE_FLEX  AND SED_EXE)
        if(NOT HAVE_FLEXML)
-               message("-- Error : Install flexml before use maintainer mode.")
+               message(STATUS "Error : Install flexml before use maintainer mode.")
        endif(NOT HAVE_FLEXML)
        if(NOT HAVE_FLEX)
-               message("-- Error : Install flex before use maintainer mode.")
+               message(STATUS "Error : Install flex before use maintainer mode.")
        endif(NOT HAVE_FLEX)
        if(NOT SED_EXE)
-               message("-- Error : Install sed before use maintainer mode.")
+               message(STATUS "Error : Install sed before use maintainer mode.")
        endif(NOT SED_EXE)
        
-       message(FATAL_ERROR "-- Error : Need to install all tools for maintainer mode !!!")
+       message(FATAL_ERROR STATUS "Error : Need to install all tools for maintainer mode !!!")
 endif(HAVE_FLEXML AND HAVE_FLEX  AND SED_EXE)
 
 endif(enable_maintainer_mode AND NOT WIN32)