Merge branch 'master' of framagit.org:simgrid/simgrid

[simgrid.git] / tools / cmake / MaintainerMode.cmake

diff --git a/tools/cmake/MaintainerMode.cmake b/tools/cmake/MaintainerMode.cmake
index f1be39c..5487904 100644 (file)
--- a/tools/cmake/MaintainerMode.cmake
+++ b/tools/cmake/MaintainerMode.cmake
@@ -15,7 +15,7 @@ if(enable_maintainer_mode AND NOT WIN32)
       OUTPUT
       ${CMAKE_HOME_DIRECTORY}/src/simix/popping_generated.cpp
       ${CMAKE_HOME_DIRECTORY}/src/simix/popping_bodies.cpp
-      ${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.h
+      ${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.hpp
       ${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.hpp
 
       DEPENDS
@@ -31,12 +31,12 @@ if(enable_maintainer_mode AND NOT WIN32)
       DEPENDS
       ${CMAKE_HOME_DIRECTORY}/src/simix/popping_generated.cpp
       ${CMAKE_HOME_DIRECTORY}/src/simix/popping_bodies.cpp
-      ${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.h
+      ${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.hpp
       ${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.hpp
       )
 
     SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
-      "${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.h;${CMAKE_HOME_DIRECTORY}/src/simix/popping_generated.cpp;${CMAKE_HOME_DIRECTORY}/src/simix/popping_bodies.cpp;${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.hpp"
+      "${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.hpp;${CMAKE_HOME_DIRECTORY}/src/simix/popping_generated.cpp;${CMAKE_HOME_DIRECTORY}/src/simix/popping_bodies.cpp;${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.hpp"
       )
   endif()
 endif()
@@ -163,6 +163,7 @@ if(enable_maintainer_mode AND NOT WIN32)
     set(string1  "'s/extern /XBT_PUBLIC_DATA /'")
     set(string2  "'s/XBT_PUBLIC_DATA \\([^(]*\\)(/XBT_PUBLIC \\1(/'")
     set(string3  "'s/XBT_PUBLIC void STag_surfxml_include/XBT_ATTRIB_NORETURN &/'") # remove with v5 of the dtd
+    set(string4  "'s/XBT_PUBLIC void STag_surfxml_\\(mount\\|storage\\)/XBT_ATTRIB_NORETURN &/'") # remove with v5 of the dtd
     set(string5  "'s/SET(DOCTYPE)/SET(ROOT_dax__adag)/'")
     set(string9  "'s/#include <unistd.h>/#if defined(_WIN32)\\n#  ifndef __STRICT_ANSI__\\n#    include <io.h>\\n#    include <process.h>\\n#  endif\\n#else\\n#  include <unistd.h>\\n#endif/g'")
     set(string14 "'\\!^ \\* Generated [0-9/]\\{10\\} [0-9:]\\{8\\}\\.$$!d'")
@@ -195,6 +196,7 @@ if(enable_maintainer_mode AND NOT WIN32)
       COMMAND ${SED_EXE} -i ${string1} src/surf/xml/simgrid_dtd.h
       COMMAND ${SED_EXE} -i ${string2} src/surf/xml/simgrid_dtd.h
       COMMAND ${SED_EXE} -i ${string3} src/surf/xml/simgrid_dtd.h
+      COMMAND ${SED_EXE} -i ${string4} src/surf/xml/simgrid_dtd.h
       COMMAND ${SED_EXE} -i ${string14} src/surf/xml/simgrid_dtd.h
       COMMAND ${CMAKE_COMMAND} -E echo "       Generated src/surf/xml/simgrid_dtd.h"