Add Sh4lt as a submodule

This commit is contained in:
Emmanuel Durand
2025-04-15 20:20:05 -04:00
parent 19f8d46dde
commit d30ee0da81
6 changed files with 23 additions and 8 deletions
+3
View File
@@ -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
Vendored Executable
+9
View File
@@ -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
-8
View File
@@ -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
Vendored Submodule
+1
Submodule external/sh4lt added at 36cff7d7b4
+4
View File
@@ -18,3 +18,7 @@ fi
# ZMQ
echo "Building ZMQ..."
./build_zmq.sh
# Sh4lt
echo "Building Sh4lt..."
./build_sh4lt.sh
+6
View File
@@ -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