fix boost layout, update submodule

hobo71 · Dec 1, 2019 · d02fce4 · d02fce4
1 parent 4e71831
commit d02fce4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -115,7 +115,7 @@ matrix:
         - 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
diff --git 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
+7 −1		.travis.yml
+5 −24		src/license_generator/CMakeLists.txt
+10 −49		test/CMakeLists.txt