Add workaround for missing dependencies on Windows Azure build

bow-simulation · May 27, 2020 · 01515cb · 01515cb
1 parent 4cca9ab
commit 01515cb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -28,8 +28,8 @@ jobs:
       mkdir build && cd build
       curl -LO https://github.com/bow-simulation/virtualbow-dependencies/releases/download/v1.2/macos-clang_64.zip && unzip macos-clang_64.zip
       cmake ../ -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=macos-clang_64/paths.cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13
-      cmake --build . -j$(nproc)
-      cmake --build . --target dmg-installer -j$(nproc)
+      cmake --build .
+      cmake --build . --target dmg-installer
       ./virtualbow-test
   - task: PublishBuildArtifacts@1
     inputs:

diff --git a/platforms/macos/CMakeLists.txt b/platforms/macos/CMakeLists.txt
@@ -20,9 +20,9 @@ add_custom_command(
     TARGET copy-dependencies
     COMMAND ${QT_BINARY_DIR}/macdeployqt
         ${CMAKE_BINARY_DIR}/application/VirtualBow.app
-        -executable=${CMAKE_BINARY_DIR}/application/VirtualBow.app/Contents/MacOS/virtualbow-gui
-        -executable=${CMAKE_BINARY_DIR}/application/VirtualBow.app/Contents/MacOS/virtualbow-slv
-        -executable=${CMAKE_BINARY_DIR}/application/VirtualBow.app/Contents/MacOS/virtualbow-post
+        --executable=${CMAKE_BINARY_DIR}/application/VirtualBow.app/Contents/MacOS/virtualbow-gui
+        --executable=${CMAKE_BINARY_DIR}/application/VirtualBow.app/Contents/MacOS/virtualbow-slv
+        --executable=${CMAKE_BINARY_DIR}/application/VirtualBow.app/Contents/MacOS/virtualbow-post
 )
 
 # Target: Dmg Installer

diff --git a/platforms/windows/CMakeLists.txt b/platforms/windows/CMakeLists.txt
@@ -25,7 +25,10 @@ add_custom_command(
     ${CMAKE_BINARY_DIR}/application/virtualbow-gui.exe
     ${CMAKE_BINARY_DIR}/application/virtualbow-slv.exe
     ${CMAKE_BINARY_DIR}/application/virtualbow-post.exe
-    --release
+    # Workaround for libraries not being deployed in azure build environment
+    COMMAND ${CMAKE_COMMAND} -E copy ${QT_BINARY_DIR}/libgcc_s_seh-1.dll ${CMAKE_BINARY_DIR}/application
+    COMMAND ${CMAKE_COMMAND} -E copy ${QT_BINARY_DIR}/libstdc++-6.dll ${CMAKE_BINARY_DIR}/application
+    COMMAND ${CMAKE_COMMAND} -E copy ${QT_BINARY_DIR}/libwinpthread-1.dll ${CMAKE_BINARY_DIR}/application
 )
 
 # Target: Inno Setup installer