Update version of pcre lib.
else(PATH_PCRE_LIB)
message(FATAL_ERROR "Please install the libpcre3-dev package or equivalent before using SimGrid.")
endif(PATH_PCRE_LIB AND PATH_PCRE_H)
else(PATH_PCRE_LIB)
message(FATAL_ERROR "Please install the libpcre3-dev package or equivalent before using SimGrid.")
endif(PATH_PCRE_LIB AND PATH_PCRE_H)
+
+set(PCRE_LIBRARY_PATH $ENV{PCRE_LIBRARY_PATH})
+
mark_as_advanced(PATH_PCRE_H)
mark_as_advanced(PATH_PCRE_LIB)
\ No newline at end of file
mark_as_advanced(PATH_PCRE_H)
mark_as_advanced(PATH_PCRE_LIB)
\ No newline at end of file
# install pcre library\r
CreateDirectory $INSTDIR\GnuWin32\r
setOutPath $INSTDIR\GnuWin32\r
# install pcre library\r
CreateDirectory $INSTDIR\GnuWin32\r
setOutPath $INSTDIR\GnuWin32\r
- file "@PATH_PCRE_LICENCE@\LICENCE"\r
-\r
- CreateDirectory $INSTDIR\GnuWin32\lib\r
- setOutPath $INSTDIR\GnuWin32\lib\r
- file @PATHLIBPCRE@\libpcre.a\r
- file @PATHLIBPCRE@\libpcreposix.a\r
- \r
- CreateDirectory $INSTDIR\GnuWin32\include\r
- setOutPath $INSTDIR\GnuWin32\include\r
- file @PATH_PCRE_H@\pcre.h\r
- file @PATH_PCRE_H@\pcreposix.h\r
+ file /r "@PCRE_LIBRARY_PATH@\lib"\r
+ file /r "@PCRE_LIBRARY_PATH@\include"\r
+ file /nonfatal /r "@PCRE_LIBRARY_PATH@\bin"\r
+ file /nonfatal /r "@PCRE_LIBRARY_PATH@\man"\r
+ file /nonfatal /r "@PCRE_LIBRARY_PATH@\share"\r
SectionEnd\r
\r
# default section start\r
SectionEnd\r
\r
# default section start\r
WriteRegExpandStr ${env_hklm} 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_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.12"\r
+ WriteRegExpandStr ${env_hklm} 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
\r
WriteRegStr HKCU "SOFTWARE\SimGrid" "Version" "@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@"\r
WriteRegStr HKCU "SOFTWARE\SimGrid" "InstallPath" "$INSTDIR"\r