From d02fce46e19f1a7b77a952210974a875c493593f Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 01 12月 2019 21:09:32 +0800
Subject: [PATCH] fix boost layout, update submodule
---
extern/license-generator | 2 +-
.travis.yml | 2 +-
src/library/os/CMakeLists.txt | 12 ++++++------
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index f65caa3..5e787b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -115,7 +115,7 @@
- sudo ln -s /usr/bin/x86_64-w64-mingw32-g++ /usr/local/bin/g++-mingw
- cd boost_1_71_0
- ./bootstrap.sh
- - travis_wait 30 ./b2 toolset=gcc-mingw target-os=windows address-model=64 --with-date_time --with-test --with-filesystem --with-program_options --with-regex --with-serialization --with-system runtime-link=static --layout=tagged --prefix=./dist release install
+ - travis_wait 30 ./b2 toolset=gcc-mingw target-os=windows address-model=64 --with-date_time --with-test --with-filesystem --with-program_options --with-regex --with-serialization --with-system runtime-link=static --prefix=./dist release install
- cd ..
- wget --no-check-certificate https://bintray.com/vszakats/generic/download_file?file_path=openssl-1.0.2h-win64-mingw.7z -O openssl.7z
- 7z x openssl.7z
diff --git a/extern/license-generator b/extern/license-generator
index 2888065..12eaeb7 160000
--- a/extern/license-generator
+++ b/extern/license-generator
@@ -1 +1 @@
-Subproject commit 2888065a157d4fb11304c4fc85bbac073a0d67a3
+Subproject commit 12eaeb702ad788ccc4ac054d69f2c819783d57c1
diff --git a/src/library/os/CMakeLists.txt b/src/library/os/CMakeLists.txt
index f2dc67b..bd460a6 100644
--- a/src/library/os/CMakeLists.txt
+++ b/src/library/os/CMakeLists.txt
@@ -1,10 +1,10 @@
IF(UNIX OR OPENSSL_FOUND)
- ADD_LIBRARY(os STATIC
- openssl/signature_verifier.cpp
- os.c
- os-linux.c
- network_id.c)
-
+ IF(UNIX)
+ ADD_LIBRARY(os STATIC openssl/signature_verifier.cpp os.c os-linux.c network_id.c)
+ ELSE(UNIX)
+ ADD_LIBRARY(os STATIC openssl/signature_verifier.cpp os.c os-win.c)
+ ENDIF(UNIX)
+
if (CMAKE_VERSION VERSION_GREATER 3.5)
target_link_libraries(os base OpenSSL::Crypto ${EXTERNAL_LIBS} ${CMAKE_DL_LIBS})
#patch for old cmake in Centos 7
--
Gitblit v1.9.1