From: unknown <pierre@.(none)>
Date: Wed, 27 Jul 2011 11:07:33 +0000 (+0200)
Subject: Need only this flag with the library libpcre.dll.a
X-Git-Tag: v3_6_2~188^2~1^2~12
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3a900e749d942065563de611d63900beeae7100a?ds=sidebyside

Need only this flag with the library libpcre.dll.a
---

diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake
index 95b1ae5717..278388cdc9 100644
--- a/buildtools/Cmake/Flags.cmake
+++ b/buildtools/Cmake/Flags.cmake
@@ -30,10 +30,6 @@ set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${custom_flags}")
 
-if(HAVE_PCRE_LIB AND WIN32)
-       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPCRE_STATIC")
-endif(HAVE_PCRE_LIB AND WIN32)
-
 # Try to make Mac a bit more complient to open source standards
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE")
diff --git a/buildtools/Cmake/Modules/FindPCRE.cmake b/buildtools/Cmake/Modules/FindPCRE.cmake
index 93fd14dd76..69e8af876a 100644
--- a/buildtools/Cmake/Modules/FindPCRE.cmake
+++ b/buildtools/Cmake/Modules/FindPCRE.cmake
@@ -11,7 +11,16 @@ find_library(PATH_PCRE_LIB
     /opt/csw
     /sw
     /usr)
-    
+message(status "PATH_PCRE_LIB ${PATH_PCRE_LIB}")
+string(REGEX MATCH ".dll.a" operation "${PATH_PCRE_LIB}")
+
+if(NOT operation)
+    if(WIN32)
+           set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPCRE_STATIC")
+    endif(WIN32)
+endif(NOT operation)
+
+
 find_path(PATH_PCRE_H "pcre.h"
     HINTS
     $ENV{SIMGRID_PCRE_LIBRARY_PATH}