Need distrib.cmake for update_xml file and update nsis script for headers.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6aafb10..54b68d1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -221,9 +221,7 @@ include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake)
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/CTestConfig.cmake)
 
 ### Setup the distrib
-if(NOT WIN32)
-    include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Distrib.cmake)
-endif(NOT WIN32)
+include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Distrib.cmake)
 
 ### Pipol compilation
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Pipol.cmake)

diff --git a/buildtools/Cmake/simgrid.nsi.in b/buildtools/Cmake/simgrid.nsi.in
index bfbb9c1..b57b18a 100644 (file)
--- a/buildtools/Cmake/simgrid.nsi.in
+++ b/buildtools/Cmake/simgrid.nsi.in
@@ -96,14 +96,12 @@ Section "Libraries and Headers" LibSection
        file @CMAKE_HOME_DIRECTORY@\include\xbt\parmap.h\r
        file @CMAKE_HOME_DIRECTORY@\include\xbt\automaton.h\r
        file @CMAKE_HOME_DIRECTORY@\include\xbt\automatonparse_promela.h\r
+       file @CMAKE_HOME_DIRECTORY@\include\xbt\datadesc.h\r
 \r
        CreateDirectory  $INSTDIR\include\simgrid\r
        setOutPath $INSTDIR\include\simgrid\r
        file @CMAKE_HOME_DIRECTORY@\include\simgrid\platf.h\r
-       \r
-       CreateDirectory  $INSTDIR\include\mc\r
-       setOutPath $INSTDIR\include\mc\r
-       file @CMAKE_HOME_DIRECTORY@\include\mc\modelchecker.h\r
+       file @CMAKE_HOME_DIRECTORY@\include\simgrid\modelchecker.h\r
        \r
        CreateDirectory  $INSTDIR\include\msg\r
        setOutPath $INSTDIR\include\msg\r
@@ -131,7 +129,6 @@ Section "Libraries and Headers" LibSection
        \r
        CreateDirectory  $INSTDIR\include\gras\r
        setOutPath $INSTDIR\include\gras\r
-       file @CMAKE_HOME_DIRECTORY@\include\gras\datadesc.h\r
        file @CMAKE_HOME_DIRECTORY@\include\gras\transport.h\r
        file @CMAKE_HOME_DIRECTORY@\include\gras\virtu.h\r
        file @CMAKE_HOME_DIRECTORY@\include\gras\emul.h\r