Move pcre2-10.34 to pcre2/

This commit is contained in:
Aaron Gyes 2020-02-19 16:41:26 -08:00
parent 7172bd38b3
commit cc5550c458
37 changed files with 3 additions and 3 deletions

2
.gitattributes vendored
View File

@ -24,7 +24,7 @@
/.travis.yml export-ignore /.travis.yml export-ignore
# for linguist; let github identify our project as C++ instead of C due to pcre2 # for linguist; let github identify our project as C++ instead of C due to pcre2
/pcre2-10.32/* linguist-vendored /pcre2/* linguist-vendored
angular.js linguist-vendored angular.js linguist-vendored
/doc_src/* linguist-documentation /doc_src/* linguist-documentation
*.fish linguist-language=fish *.fish linguist-language=fish

View File

@ -15,8 +15,8 @@ IF (PCRE2_LIB AND PCRE2_INCLUDE_DIR)
MESSAGE(STATUS "Found system PCRE2 library ${PCRE2_INCLUDE_DIR}") MESSAGE(STATUS "Found system PCRE2 library ${PCRE2_INCLUDE_DIR}")
ELSE() ELSE()
MESSAGE(STATUS "Using bundled PCRE2 library") MESSAGE(STATUS "Using bundled PCRE2 library")
ADD_SUBDIRECTORY(pcre2-10.34 EXCLUDE_FROM_ALL) ADD_SUBDIRECTORY(pcre2 EXCLUDE_FROM_ALL)
SET(PCRE2_INCLUDE_DIR ${CMAKE_BINARY_DIR}/pcre2-10.34/) SET(PCRE2_INCLUDE_DIR ${CMAKE_BINARY_DIR}/pcre2)
SET(PCRE2_LIB pcre2-${PCRE2_WIDTH}) SET(PCRE2_LIB pcre2-${PCRE2_WIDTH})
ENDIF(PCRE2_LIB AND PCRE2_INCLUDE_DIR) ENDIF(PCRE2_LIB AND PCRE2_INCLUDE_DIR)
INCLUDE_DIRECTORIES(${PCRE2_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${PCRE2_INCLUDE_DIR})