Don't import smpi binaries on windows and set environment variables on current user

[simgrid.git] / buildtools / Cmake / simgrid.nsi.in

diff --git a/buildtools/Cmake/simgrid.nsi.in b/buildtools/Cmake/simgrid.nsi.in
index 48964ec..bfbb9c1 100644 (file)
--- a/buildtools/Cmake/simgrid.nsi.in
+++ b/buildtools/Cmake/simgrid.nsi.in
@@ -165,11 +165,6 @@ Section "Binaries" BinSection
        file bin\graphicator@BIN_EXE@\r
        file bin\gras_stub_generator@BIN_EXE@\r
        file bin\simgrid_update_xml\r
-       file bin\smpicc\r
-       file bin\smpif2c\r
-       file bin\smpiff\r
-       file bin\smpirun\r
-       file bin\tesh\r
        \r
 SectionEnd\r
 Section "Documentation" DocSection     \r
@@ -236,11 +231,11 @@ section
        !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'\r
        !define env_hkcu 'HKCU "Environment"'\r
        # Set Variables\r
-       WriteRegExpandStr ${env_hklm} SIMGRID_ROOT $INSTDIR\r
-       WriteRegExpandStr ${env_hklm} SIMGRID_VERSION @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\r
+       WriteRegExpandStr ${env_hkcu} SIMGRID_ROOT $INSTDIR\r
+       WriteRegExpandStr ${env_hkcu} SIMGRID_VERSION @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\r
 \r
-       WriteRegExpandStr ${env_hklm} SIMGRID_PCRE_LIBRARY_PATH $INSTDIR\GnuWin32\r
-       WriteRegExpandStr ${env_hklm} SIMGRID_PCRE_LIBRARY_VERSION "8.21"\r
+       WriteRegExpandStr ${env_hkcu} SIMGRID_PCRE_LIBRARY_PATH $INSTDIR\GnuWin32\r
+       WriteRegExpandStr ${env_hkcu} SIMGRID_PCRE_LIBRARY_VERSION "8.21"\r
 \r
        WriteRegStr HKCU "SOFTWARE\SimGrid" "Version" "@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@"\r
        WriteRegStr HKCU "SOFTWARE\SimGrid" "InstallPath" "$INSTDIR"\r
@@ -395,10 +390,10 @@ section "Uninstall"
        RMDir   /r "$INSTDIR\GnuWin32"\r
        \r
        # Delete variable\r
-       DeleteRegValue ${env_hklm} SIMGRID_ROOT\r
-       DeleteRegValue ${env_hklm} SIMGRID_VERSION\r
-       DeleteRegValue ${env_hklm} SIMGRID_PCRE_LIBRARY_PATH\r
-       DeleteRegValue ${env_hklm} SIMGRID_PCRE_LIBRARY_VERSION\r
+       DeleteRegValue ${env_hkcu} SIMGRID_ROOT\r
+       DeleteRegValue ${env_hkcu} SIMGRID_VERSION\r
+       DeleteRegValue ${env_hkcu} SIMGRID_PCRE_LIBRARY_PATH\r
+       DeleteRegValue ${env_hkcu} SIMGRID_PCRE_LIBRARY_VERSION\r
     DeleteRegKey HKCU "SOFTWARE\SimGrid"\r
     \r
     # delete INSTDIR\r