From 5a6aa763cacf020ccd7025bbf9b64c96e5ebe133 Mon Sep 17 00:00:00 2001 From: simon987 Date: Tue, 21 Apr 2020 16:28:45 -0400 Subject: [PATCH] build fix --- CMakeLists.txt | 6 ++++-- README.md | 2 +- ci/build.sh | 4 ++-- third-party/libscan | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 04fc243..ae2d9f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,13 +32,15 @@ add_executable( src/cli.c src/cli.h ) -target_link_directories(sist2 PRIVATE BEFORE /usr/share/vcpkg/installed/x64-linux/lib/) +target_link_directories(sist2 PRIVATE BEFORE ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/) set(CMAKE_FIND_LIBRARY_SUFFIXES .a .lib) find_package(lmdb CONFIG REQUIRED) find_package(cJSON CONFIG REQUIRED) find_package(unofficial-glib CONFIG REQUIRED) find_package(unofficial-mongoose CONFIG REQUIRED) +find_library(UUID_LIB NAMES uuid) + #find_package(OpenSSL REQUIRED) @@ -104,7 +106,7 @@ target_link_libraries( unofficial::mongoose::mongoose # OpenSSL::SSL OpenSSL::Crypto - uuid + ${UUID_LIB} pthread magic diff --git a/README.md b/README.md index 4f08971..7a73437 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ binaries (GCC 7+ required). 1. Install compile-time dependencies ```bash - vcpkg install lmdb cjson glib libarchive[core,bzip2,libxml2,lz4,lzma,lzo] pthread tesseract libxml2 ffmpeg zstd gtest mongoose + vcpkg install lmdb cjson glib libarchive[core,bzip2,libxml2,lz4,lzma,lzo] pthread tesseract libxml2 ffmpeg zstd gtest mongoose libuuid libmagic ``` 2. Build diff --git a/ci/build.sh b/ci/build.sh index 4b5f4dc..b979aea 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash -rm -rf CMakeFiles CmakeCache.txt +rm -rf CMakeFiles CMakeCache.txt cmake -DSIST_DEBUG=off -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake . make strip sist2 -rm -rf CMakeFiles CmakeCache.txt +rm -rf CMakeFiles CMakeCache.txt cmake -DSIST_DEBUG=on -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake . make diff --git a/third-party/libscan b/third-party/libscan index faa2d8a..5739391 160000 --- a/third-party/libscan +++ b/third-party/libscan @@ -1 +1 @@ -Subproject commit faa2d8a68c3377d12bbaf1560cba9cb909007d6f +Subproject commit 5739391cb71fa6bcfe4a77691b2fe02eec773326