From dc64b12077c06cc9530db57ff99b1710f287b3c0 Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Fri, 11 Dec 2015 06:37:11 +0200 Subject: [PATCH] Fixed PCRE2 libraries missing symbolic link to library The libpcre2-8.so was not a symbolic link but an actual library. --- cmake/BuildPCRE2.cmake | 4 +++- pcre2/CMakeLists.txt | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/BuildPCRE2.cmake b/cmake/BuildPCRE2.cmake index 98e13acdd..823053e56 100644 --- a/cmake/BuildPCRE2.cmake +++ b/cmake/BuildPCRE2.cmake @@ -9,7 +9,9 @@ include(ExternalProject) set(PCRE2_ROOT_DIR ${CMAKE_SOURCE_DIR}/pcre2/) set(PCRE2_BUILD_DIR ${CMAKE_BINARY_DIR}/pcre2/) -set(PCRE2_LIBRARIES ${CMAKE_BINARY_DIR}/pcre2/libpcre2-8.so CACHE STRING "PCRE2 dynamic libraries" FORCE) +set(PCRE2_LIBRARIES ${CMAKE_BINARY_DIR}/pcre2/libpcre2-8.so + ${CMAKE_BINARY_DIR}/pcre2/libpcre2-8.so.1.0.0 + CACHE STRING "PCRE2 dynamic libraries" FORCE) ExternalProject_Add(pcre2 SOURCE_DIR ${PCRE2_ROOT_DIR} CMAKE_ARGS -DBUILD_SHARED_LIBS=Y -DPCRE2_BUILD_PCRE2GREP=N -DPCRE2_BUILD_TESTS=N diff --git a/pcre2/CMakeLists.txt b/pcre2/CMakeLists.txt index 4cf76fd75..69afafd8f 100644 --- a/pcre2/CMakeLists.txt +++ b/pcre2/CMakeLists.txt @@ -468,6 +468,8 @@ IF(PCRE2_BUILD_PCRE2_8) ADD_LIBRARY(pcre2-8 ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h) SET_PROPERTY(TARGET pcre2-8 PROPERTY COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=8) +SET_PROPERTY(TARGET pcre2-8 + PROPERTY VERSION 1.0.0) SET(targets ${targets} pcre2-8) ADD_LIBRARY(pcre2posix ${PCRE2POSIX_HEADERS} ${PCRE2POSIX_SOURCES}) SET_PROPERTY(TARGET pcre2posix