Deukhoofd
/
Arbutils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't link statically, but copy libwinpthread for Windows build.
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Deukhoofd 2020-05-03 12:35:17 +02:00
parent 444816ce1b
commit 1e90ca80fe
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.drone.yml
View File

@ -37,6 +37,7 @@ steps:
- cmake -DCMAKE_BUILD_TYPE=Release . -B build-release-windows -D CMAKE_C_COMPILER=/usr/bin/x86_64-w64-mingw32-gcc -D CMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -DWINDOWS=ON -DSTATICC=ON - cmake -DCMAKE_BUILD_TYPE=Release . -B build-release-windows -D CMAKE_C_COMPILER=/usr/bin/x86_64-w64-mingw32-gcc -D CMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -DWINDOWS=ON -DSTATICC=ON
- cmake --build build-release-windows --target all -- -j 4 - cmake --build build-release-windows --target all -- -j 4
- export WINEARCH=win64 - export WINEARCH=win64
- cp /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll /drone/src/build-release-windows/bin/
- wine build-release-windows/ArbutilsTests.exe -s - wine build-release-windows/ArbutilsTests.exe -s
- name: conan-deploy - name: conan-deploy
image: deukhoofd/linux64builder image: deukhoofd/linux64builder

4
CMakeLists.txt
View File

@ -28,9 +28,9 @@ if (WINDOWS)
endif (WINDOWS) endif (WINDOWS)
if (STATICC) if (STATICC)
target_link_libraries(Arbutils -static -static-libgcc -static-libstdc++) target_link_libraries(Arbutils -static-libgcc -static-libstdc++)
if (NOT DEFINED CONAN_EXPORTED) if (NOT DEFINED CONAN_EXPORTED)
target_link_libraries(ArbutilsTests -static -static-libgcc -static-libstdc++) target_link_libraries(ArbutilsTests -static-libgcc -static-libstdc++)
endif() endif()
endif(STATICC) endif(STATICC)