From 13333d25e7025f0903f45d33581243f3643dbbe2 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Feb 2012 14:22:37 +0100 Subject: [PATCH 1/1] Need distrib.cmake for update_xml file and update nsis script for headers. --- CMakeLists.txt | 4 +--- buildtools/Cmake/simgrid.nsi.in | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6aafb106f3..54b68d11d4 100644 --- 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 bfbb9c1672..b57b18a95d 100644 --- 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 file @CMAKE_HOME_DIRECTORY@\include\xbt\automaton.h file @CMAKE_HOME_DIRECTORY@\include\xbt\automatonparse_promela.h + file @CMAKE_HOME_DIRECTORY@\include\xbt\datadesc.h CreateDirectory $INSTDIR\include\simgrid setOutPath $INSTDIR\include\simgrid file @CMAKE_HOME_DIRECTORY@\include\simgrid\platf.h - - CreateDirectory $INSTDIR\include\mc - setOutPath $INSTDIR\include\mc - file @CMAKE_HOME_DIRECTORY@\include\mc\modelchecker.h + file @CMAKE_HOME_DIRECTORY@\include\simgrid\modelchecker.h CreateDirectory $INSTDIR\include\msg setOutPath $INSTDIR\include\msg @@ -131,7 +129,6 @@ Section "Libraries and Headers" LibSection CreateDirectory $INSTDIR\include\gras setOutPath $INSTDIR\include\gras - file @CMAKE_HOME_DIRECTORY@\include\gras\datadesc.h file @CMAKE_HOME_DIRECTORY@\include\gras\transport.h file @CMAKE_HOME_DIRECTORY@\include\gras\virtu.h file @CMAKE_HOME_DIRECTORY@\include\gras\emul.h -- 2.20.1