From: unknown <pierre@.(none)>
Date: Tue, 26 Jul 2011 10:24:29 +0000 (+0200)
Subject: Search for the pcre licence.
X-Git-Tag: v3_6_2~188^2~8^2~1
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/bb67b63d87d1176015342a01d8fe739fc1f5c6a5

Search for the pcre licence.
---

diff --git a/buildtools/Cmake/Modules/FindPCRE.cmake b/buildtools/Cmake/Modules/FindPCRE.cmake
index 9f4398fd93..93fd14dd76 100644
--- 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 414786c6a9..e2f615123f 100644
--- a/buildtools/Cmake/simgrid.nsi.in
+++ b/buildtools/Cmake/simgrid.nsi.in
@@ -179,10 +179,11 @@ Section "Examples" ExamplesSection
 	
 SectionEnd
 Section "Pcre library" PCRESection	
-	
 	# install pcre library
 	CreateDirectory $INSTDIR\GnuWin32
-	
+	setOutPath $INSTDIR\GnuWin32
+	file "@PATH_PCRE_LICENCE@\LICENCE"
+
 	CreateDirectory $INSTDIR\GnuWin32\lib
 	setOutPath $INSTDIR\GnuWin32\lib
 	file @PATHLIBPCRE@\libpcre.a
@@ -192,9 +193,6 @@ Section "Pcre library" PCRESection
 	setOutPath $INSTDIR\GnuWin32\include
 	file @PATH_PCRE_H@\pcre.h
 	file @PATH_PCRE_H@\pcreposix.h
-	
-	setOutPath $INSTDIR\GnuWin32\
-	file @PATH_PCRE_H@\..\LICENCE
 SectionEnd
 
 # default section start