Fix build scripts

This commit is contained in:
Tindy X 2020-07-01 02:39:57 +08:00
parent 3aeb379696
commit 33a5cfcb82
No known key found for this signature in database
GPG Key ID: C6AD413169968D58
2 changed files with 3 additions and 2 deletions

View File

@ -76,9 +76,10 @@ FIND_PACKAGE(Rapidjson REQUIRED)
INCLUDE_DIRECTORIES(${RAPIDJSON_INCLUDE_DIRS})
PKG_CHECK_MODULES(YAML_CPP yaml-cpp>=0.6.3 REQUIRED)
FIND_LIBRARY(YAML_CPP_LIBRARY NAMES yaml-cpp yaml-cppd PATHS ${YAML_CPP_LIBRARY_DIRS})
LINK_DIRECTORIES(${YAML_CPP_LIBRARY_DIRS})
INCLUDE_DIRECTORIES(${YAML_CPP_INCLUDE_DIRS})
TARGET_LINK_LIBRARIES(subconverter ${YAML_CPP_LIBRARIES})
TARGET_LINK_LIBRARIES(subconverter ${YAML_CPP_LIBRARY})
#IF(USING_STD_REGEX STREQUAL "ON")
# ADD_DEFINITIONS(-DUSE_STD_REGEX)

View File

@ -36,7 +36,7 @@ export PKG_CONFIG_PATH=/usr/lib64/pkgconfig
cmake .
make -j2
rm subconverter
g++ -o base/subconverter $(find CMakeFiles/subconverter.dir/src/ -name "*.o") -static -lpcre2-8 -levent -lyaml-cpp -L/usr/lib64 -lcurl -lnghttp2 -lmbedtls -lmbedcrypto -lmbedx509 -lz -lduktape -lduktape_module -O3 -s
g++ -o base/subconverter $(find CMakeFiles/subconverter.dir/src/ -name "*.o") -static -lpcre2-8 -levent -lyaml-cpp -L/usr/lib64 -lcurl -lmbedtls -lmbedcrypto -lmbedx509 -lz -lduktape -lduktape_module -O3 -s
cd base
chmod +rx subconverter