From 33a5cfcb820258746193b8375ff33742f8bf2723 Mon Sep 17 00:00:00 2001 From: Tindy X <49061470+tindy2013@users.noreply.github.com> Date: Wed, 1 Jul 2020 02:39:57 +0800 Subject: [PATCH] Fix build scripts --- CMakeLists.txt | 3 ++- scripts/build.alpine.release.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1533774..47a4dde 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/scripts/build.alpine.release.sh b/scripts/build.alpine.release.sh index 06ca965..7a79a70 100644 --- a/scripts/build.alpine.release.sh +++ b/scripts/build.alpine.release.sh @@ -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