gcontini
2019-12-01 d02fce46e19f1a7b77a952210974a875c493593f
fix boost layout, update submodule
3个文件已修改
14 ■■■■ 已修改文件
.travis.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
extern/license-generator @ 12eaeb 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/library/os/CMakeLists.txt 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.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
extern/license-generator
@@ -1 +1 @@
Subproject commit 2888065a157d4fb11304c4fc85bbac073a0d67a3
Subproject commit 12eaeb702ad788ccc4ac054d69f2c819783d57c1
src/library/os/CMakeLists.txt
@@ -1,9 +1,9 @@
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})