Skip to content

Commit

Permalink
pcre: update to 8.37
Browse files Browse the repository at this point in the history
Updates PCRE to 8.37 (current upstream version) which can detect PPC64LE
machine.

Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>
  • Loading branch information
David Abdurachmanov authored and peremato committed Oct 16, 2015
1 parent 134b6b2 commit e39e3f3
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ core/base/src/RGitCommit.h
/core/metautils/src/stlLoader_complex.cc

# /core/pcre/src/
/core/pcre/src/pcre-7.8
/core/pcre/src/pcre-8.37

# /core/utils/src/
/core/utils/src/rootcint_tmp
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/SearchInstalledSoftware.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ if(NOT builtin_pcre)
endif()
endif()
if(builtin_pcre)
set(PCRE_INCLUDE_DIR ${CMAKE_BINARY_DIR}/core/pcre/pcre-7.8)
set(PCRE_INCLUDE_DIR ${CMAKE_BINARY_DIR}/core/pcre/pcre-8.37)
if(WIN32)
set(PCRE_LIBRARIES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libpcre.lib)
else()
Expand Down
4 changes: 2 additions & 2 deletions core/pcre/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@

# Define package related variables
set(PCRE_SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
set(PCRE_VERSION "pcre-7.8")
set(PCRE_VERSION "pcre-8.37")
set(PCRE_TARGZFILE ${PCRE_SRCDIR}/${PCRE_VERSION}.tar.gz)
set(PCRE_TARFILE ${PCRE_SRCDIR}/${PCRE_VERSION}.tar)

if(WIN32)
set(pcreliba ${CMAKE_CURRENT_BINARY_DIR}/win32/libpcre-7.8.lib)
set(pcreliba ${CMAKE_CURRENT_BINARY_DIR}/win32/libpcre-8.37.lib)
set(pcrelib ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libpcre.lib)
if(winrtdebug)
set(pcrebuild "libpcre - Win32 Debug")
Expand Down
4 changes: 2 additions & 2 deletions core/pcre/Module.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Author: Fons Rademakers, 28/11/2005

MODNAME := pcre
PCREVERS := pcre-7.8
PCREVERS := pcre-8.37

ifneq ($(BUILTINPCRE), yes)

Expand Down Expand Up @@ -32,7 +32,7 @@ PCREDIRI := $(PCREDIRS)/$(PCREVERS)
##### libpcre #####
PCRELIBS := $(MODDIRS)/$(PCREVERS).tar.gz
ifeq ($(PLATFORM),win32)
PCRELIBA := $(call stripsrc,$(MODDIRS)/win32/libpcre-7.8.lib)
PCRELIBA := $(call stripsrc,$(MODDIRS)/win32/libpcre-8.37.lib)
PCRELIB := $(LPATH)/libpcre.lib
ifeq (yes,$(WINRTDEBUG))
PCREBLD := "libpcre - Win32 Debug"
Expand Down
Binary file removed core/pcre/src/pcre-7.8.tar.gz
Binary file not shown.
Binary file added core/pcre/src/pcre-8.37.tar.gz
Binary file not shown.
4 changes: 2 additions & 2 deletions core/pcre/src/win32/Makefile.msc
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#
# Library definitions
#
SRCDIR = pcre-7.8
SRCDIR = pcre-8.37
LIBDIR = ./
LIBRARY = libpcre-7.8
LIBRARY = libpcre-8.37
LIBDLL = $(LIBDIR)\$(LIBRARY).dll
LIBLIB = $(LIBDIR)\$(LIBRARY).lib

Expand Down

0 comments on commit e39e3f3

Please sign in to comment.