From 116afbd15383060d23c45d034b2c4507df8d8065 Mon Sep 17 00:00:00 2001 From: NikitaZotov Date: Sun, 6 Oct 2024 15:21:58 +0300 Subject: [PATCH] [scripts][cmake] Install libxml2 --- sc-tools/sc-builder/CMakeLists.txt | 3 +-- scripts/install_deps_macOS.sh | 2 +- scripts/install_deps_ubuntu.sh | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sc-tools/sc-builder/CMakeLists.txt b/sc-tools/sc-builder/CMakeLists.txt index 97ff6e311b..127fb44b9f 100644 --- a/sc-tools/sc-builder/CMakeLists.txt +++ b/sc-tools/sc-builder/CMakeLists.txt @@ -14,11 +14,10 @@ add_library(sc-builder-lib SHARED ${SOURCES}) target_link_libraries(sc-builder-lib LINK_PUBLIC sc-memory LINK_PUBLIC sc-config-utils - LINK_PRIVATE ${LIBXML2_LIBRARIES} + LINK_PRIVATE LibXml2::LibXml2 ) target_include_directories(sc-builder-lib PUBLIC ${SC_BUILDER_SRC} - PRIVATE ${LIBXML2_INCLUDE_DIR} ) add_executable(sc-builder "${SC_BUILDER_SRC}/src/main.cpp") diff --git a/scripts/install_deps_macOS.sh b/scripts/install_deps_macOS.sh index 21eb954ffc..f087e6360c 100755 --- a/scripts/install_deps_macOS.sh +++ b/scripts/install_deps_macOS.sh @@ -6,6 +6,6 @@ then source "$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)/set_vars.sh" fi -brew install glib antlr antlr4-cpp-runtime temurin pkgconfig cmake ninja ccache asio websocketpp nlohmann-json +brew install glib antlr antlr4-cpp-runtime temurin pkgconfig cmake ninja ccache asio websocketpp nlohmann-json libxml2 "${SC_MACHINE_PATH}/scripts/install_deps_python.sh" diff --git a/scripts/install_deps_ubuntu.sh b/scripts/install_deps_ubuntu.sh index a254dd23df..c5bb6b6bbc 100755 --- a/scripts/install_deps_ubuntu.sh +++ b/scripts/install_deps_ubuntu.sh @@ -38,6 +38,7 @@ packagelist_dev=( libasio-dev libwebsocketpp-dev nlohmann-json3-dev + libxml2 python3-dev )