mirror of
https://gitlab.com/splashmapper/splash.git
synced 2026-06-16 12:33:50 +02:00
Add Sh4lt as a submodule
This commit is contained in:
@@ -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
|
||||
|
||||
+9
@@ -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
|
||||
Vendored
-8
@@ -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
|
||||
|
||||
+1
Submodule external/sh4lt added at 36cff7d7b4
@@ -18,3 +18,7 @@ fi
|
||||
# ZMQ
|
||||
echo "Building ZMQ..."
|
||||
./build_zmq.sh
|
||||
|
||||
# Sh4lt
|
||||
echo "Building Sh4lt..."
|
||||
./build_sh4lt.sh
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user