Search for the pcre licence.

diff --git a/buildtools/Cmake/Modules/FindPCRE.cmake b/buildtools/Cmake/Modules/FindPCRE.cmake
index 9f4398f..93fd14d 100644 (file)
--- a/buildtools/Cmake/Modules/FindPCRE.cmake
+++ b/buildtools/Cmake/Modules/FindPCRE.cmake
@@ -24,7 +24,7 @@ find_path(PATH_PCRE_H "pcre.h"
     /opt/csw
     /sw
     /usr)
-    
+       
 set(HAVE_PCRE_LIB 0)
 
 message(STATUS "Looking for pcre.h")
@@ -41,6 +41,27 @@ else(PATH_PCRE_LIB)
 message(STATUS "Looking for lib pcre - not found")
 endif(PATH_PCRE_LIB)
 
+if(WIN32)
+    find_path(PATH_PCRE_LICENCE "LICENCE"
+        HINTS
+        $ENV{SIMGRID_PCRE_LIBRARY_PATH}
+        $ENV{LD_LIBRARY_PATH}
+        $ENV{PCRE_LIBRARY_PATH}
+        PATH_SUFFIXES GnuWin32
+        PATHS
+        /opt
+        /opt/local
+        /opt/csw
+        /sw
+        /usr)
+    message(STATUS "Looking for pcre licence")
+    if(PATH_PCRE_LICENCE)
+    message(STATUS "Looking for pcre licence - found")
+    else(PATH_PCRE_LICENCE)
+    message(STATUS "Looking for pcre licence - not found")
+    endif(PATH_PCRE_LICENCE)
+endif(WIN32)
+
 if(PATH_PCRE_LIB AND PATH_PCRE_H)
        string(REGEX REPLACE "/libpcre.*[.]${LIB_EXE}$" "" PATHLIBPCRE "${PATH_PCRE_LIB}")
        string(REGEX REPLACE "/pcre.h" "" PATH_PCRE_H "${PATH_PCRE_H}")

diff --git a/buildtools/Cmake/simgrid.nsi.in b/buildtools/Cmake/simgrid.nsi.in
index 414786c..e2f6151 100644 (file)
--- a/buildtools/Cmake/simgrid.nsi.in
+++ b/buildtools/Cmake/simgrid.nsi.in
@@ -179,10 +179,11 @@ Section "Examples" ExamplesSection
        \r
 SectionEnd\r
 Section "Pcre library" PCRESection     \r
-       \r
        # install pcre library\r
        CreateDirectory $INSTDIR\GnuWin32\r
-       \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
@@ -192,9 +193,6 @@ Section "Pcre library" PCRESection
        setOutPath $INSTDIR\GnuWin32\include\r
        file @PATH_PCRE_H@\pcre.h\r
        file @PATH_PCRE_H@\pcreposix.h\r
-       \r
-       setOutPath $INSTDIR\GnuWin32\\r
-       file @PATH_PCRE_H@\..\LICENCE\r
 SectionEnd\r
 \r
 # default section start\r