From d30ee0da8108fe246dc43ef513d6bb7fa40ec9aa Mon Sep 17 00:00:00 2001 From: Emmanuel Durand Date: Tue, 15 Apr 2025 20:20:05 -0400 Subject: [PATCH] Add Sh4lt as a submodule --- .gitmodules | 3 +++ external/build_sh4lt.sh | 9 +++++++++ external/build_zmq.sh | 8 -------- external/sh4lt | 1 + make_deps.sh | 4 ++++ src/CMakeLists.txt | 6 ++++++ 6 files changed, 23 insertions(+), 8 deletions(-) create mode 100755 external/build_sh4lt.sh create mode 160000 external/sh4lt diff --git a/.gitmodules b/.gitmodules index c4004894..0005dfe3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,3 +34,6 @@ [submodule "external/stduuid"] path = external/stduuid url = https://github.com/mariusbancila/stduuid.git +[submodule "external/sh4lt"] + path = external/sh4lt + url = https://gitlab.com/sh4lt/sh4lt.git diff --git a/external/build_sh4lt.sh b/external/build_sh4lt.sh new file mode 100755 index 00000000..2c34868f --- /dev/null +++ b/external/build_sh4lt.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +SOURCE_DIR="$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)" + +cd ${SOURCE_DIR}/sh4lt +rm -rf build +mkdir build && cd build +cmake -GNinja -DCMAKE_INSTALL_PREFIX=${SOURCE_DIR}/third_parties -DCMAKE_BUILD_TYPE=Release -DSH4LT_WITH_PYTHON=off .. +ninja && ninja install diff --git a/external/build_zmq.sh b/external/build_zmq.sh index e35d448e..6230106a 100755 --- a/external/build_zmq.sh +++ b/external/build_zmq.sh @@ -2,14 +2,6 @@ SOURCE_DIR="$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)" -if hash nproc; then - CPU_COUNT=$(nproc) -elif hash gnproc; then - CPU_COUNT=$(gnproc) -else - CPU_COUNT=1 -fi - cd ${SOURCE_DIR}/zmq rm -rf build mkdir build && cd build diff --git a/external/sh4lt b/external/sh4lt new file mode 160000 index 00000000..36cff7d7 --- /dev/null +++ b/external/sh4lt @@ -0,0 +1 @@ +Subproject commit 36cff7d7b47547560446c9b96438763215c78c6c diff --git a/make_deps.sh b/make_deps.sh index 54e68890..0fa26a39 100755 --- a/make_deps.sh +++ b/make_deps.sh @@ -18,3 +18,7 @@ fi # ZMQ echo "Building ZMQ..." ./build_zmq.sh + +# Sh4lt +echo "Building Sh4lt..." +./build_sh4lt.sh diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b66b3fd6..73cacc71 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -373,8 +373,14 @@ endif() if (USE_SYSTEM_LIBS) target_link_libraries(splash-${API_VERSION} zmq) + if (HAVE_SH4LT) + target_link_libraries(splash-${API_VERSION} sh4lt-0.1) + endif() else() target_link_libraries(splash-${API_VERSION} zmq.a) + if (HAVE_SH4LT) + target_link_libraries(splash-${API_VERSION} sh4lt-0.1_static.a) + endif() endif() # System libs