diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 796b690d01..33179662fd 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -121,7 +121,7 @@ if (${BUILD_CONTRIB}) cat("${TD_SUPPORT_DIR}/rocksdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) add_definitions(-DUSE_ROCKSDB) endif() -else() +else() if (NOT ${TD_LINUX}) if(${BUILD_WITH_ROCKSDB}) cat("${TD_SUPPORT_DIR}/rocksdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) @@ -183,6 +183,11 @@ if(${BUILD_GEOS}) cat("${TD_SUPPORT_DIR}/geos_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) endif() +# +if(${BUILD_PCRE2}) + cat("${TD_SUPPORT_DIR}/pcre2_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) +endif() + # download dependencies configure_file(${CONTRIB_TMP_FILE} "${TD_CONTRIB_DIR}/deps-download/CMakeLists.txt") execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . @@ -270,8 +275,8 @@ unset(CMAKE_PROJECT_INCLUDE_BEFORE) # add_subdirectory(xz EXCLUDE_FROM_ALL) # target_include_directories( # xz -# PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/xz -# PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/xz +# PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/xz +# PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/xz # ) # leveldb @@ -351,7 +356,7 @@ if (${BUILD_WITH_ROCKSDB}) rocksdb PUBLIC $ ) - else() + else() if (NOT ${TD_LINUX}) MESSAGE(STATUS "ROCKSDB CXX STATUS CONFIG: " ${CMAKE_CXX_FLAGS}) MESSAGE(STATUS "ROCKSDB C STATUS CONFIG: " ${CMAKE_C_FLAGS}) @@ -400,8 +405,8 @@ if (${BUILD_WITH_ROCKSDB}) rocksdb PUBLIC $ ) - endif() - + endif() + endif() endif() @@ -605,6 +610,10 @@ if(${BUILD_GEOS}) ) endif(${BUILD_GEOS}) +if (${BUILD_PCRE2}) + add_subdirectory(pcre2 EXCLUDE_FROM_ALL) +endif(${BUILD_PCRE2}) + # ================================================================================================ # Build test # ================================================================================================