Skip to content

Commit 9eed39b

Browse files
Dotsenko Andreyandr-dots
authored andcommitted
experiments (temporary commit)
1 parent 7fe970a commit 9eed39b

3 files changed

Lines changed: 34 additions & 5 deletions

File tree

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,11 @@ else(HAVE_SUBUNIT)
319319
endif (HAVE_SUBUNIT)
320320

321321
if (NOT ENABLE_REGEX AND WITH_PCREPOSIX)
322+
find_package(PCREPOSIX)
323+
if (PCREPOSIX_FOUND)
324+
include_directories(${PCREPOSIX_INCLUDE_DIRS})
325+
link_directories(${PCREPOSIX_LIBRARY_DIRS})
326+
endif()
322327
# pcreposix functions are just wrappers for pcre functions
323328
check_library_exists(pcreposix regcomp "" HAVE_LIBPCREPOSIX)
324329
if (HAVE_LIBPCREPOSIX)

appveyor.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ version: 1.0.{build}
2121

2222
environment:
2323
matrix:
24-
- platform: msvc
25-
- platform: vs
26-
- platform: cygwin
24+
# - platform: msvc
25+
# - platform: vs
26+
# - platform: cygwin
2727
- platform: mingw32
28-
- platform: mingw64msys
28+
# - platform: mingw64msys
2929

3030
# scripts that are called at very beginning, before repo cloning
3131
# init:
@@ -57,7 +57,10 @@ before_build:
5757
- if %platform%==cygwin bash -c "autoreconf -i"
5858
- if %platform%==cygwin bash -c "./configure"
5959
- if %platform%==mingw32 set PATH=C:\MinGW\bin;%PATH%
60-
- if %platform%==mingw32 appveyor-retry nuget install pcre -Verbosity detailed -OutputDirectory C:\pcre
60+
# - if %platform%==mingw32 appveyor-retry nuget install pcre -Verbosity detailed -OutputDirectory C:\pcre
61+
- if %platform%==mingw32 appveyor-retry nuget install pcre -Verbosity detailed -ExcludeVersion
62+
- ps: Get-ChildItem -Recurse C:\pcre
63+
- set CMAKE_PREFIX_PATH=C:\pcre\pcre.8.33.0.1\build\native
6164
- if %platform%==mingw32 cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=%P%
6265
- if %platform%==mingw64msys set PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%
6366
- if %platform%==mingw64msys bash -c "autoreconf -i"

cmake/FindPCREPOSIX.cmake

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
include(FindPackageHandleStandardArgs)
2+
3+
find_path(PCREPOSIX_INCLUDE_DIR NAMES pcreposix.h)
4+
find_library(PCREPOSIX_LIBRARY NAMES pcreposix)
5+
find_library(PCRE_LIBRARY NAMES pcre)
6+
7+
message("PCREPOSIX_LIBRARY: ${PCREPOSIX_LIBRARY}")
8+
message("PCRE_LIBRARY: ${PCRE_LIBRARY}")
9+
10+
find_package_handle_standard_args(PCREPOSIX DEFAULT_MSG PCREPOSIX_LIBRARY PCREPOSIX_INCLUDE_DIR)
11+
12+
if(PCREPOSIX_FOUND)
13+
set(PCREPOSIX_LIBRARIES ${PCREPOSIX_LIBRARY})
14+
set(PCREPOSIX_INCLUDE_DIRS ${PCREPOSIX_INCLUDE_DIR})
15+
else()
16+
set(PCREPOSIX_LIBRARIES)
17+
set(PCREPOSIX_INCLUDE_DIRS)
18+
endif()
19+
20+
mark_as_advanced(PCREPOSIX_INCLUDE_DIRS PCREPOSIX_LIBRARIES)
21+

0 commit comments

Comments
 (0)