Fix copying dlls to install folder for windows install target

pioneerspacesim · Dec 16, 2020 · 334990c · 334990c
1 parent 58ddd30
commit 334990c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
@@ -46,7 +46,7 @@ jobs:
           cd pioneer
           mkdir build
           cd build
-          cmake .. -G Ninja -DCMAKE_INSTALL_PREFIX="C:/Program Files/Pioneer" -DPIONEER_DATA_DIR="C:/Program Files/Pioneer/data" -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_MESSAGE=NEVER -DGIT_EXECUTABLE="c:/Program Files/Git/cmd/git.exe"
+          cmake .. -G Ninja -DCMAKE_INSTALL_PREFIX="C:/Program Files/Pioneer" -DPIONEER_DATA_DIR="C:/Program Files/Pioneer/data" -DCMAKE_BUILD_TYPE:STRING=Release -DGIT_EXECUTABLE="c:/Program Files/Git/cmd/git.exe"
           cmake --build .
 
       - name: Build Pioneer Data

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -396,7 +396,7 @@ install(DIRECTORY data/models/
 if (WIN32)
 	configure_file(pioneer.iss.cmakein pioneer.iss @ONLY)
 	configure_file(CI/appveyor/msvc/publish.cmd.cmakein publish.cmd @ONLY)
-	file(GLOB win_libs ../pioneer-thirdparty/win32/bin/x64/vs2017/*.dll)
+	file(GLOB win_libs ../pioneer-thirdparty/win32/bin/${MSVC_ARCH}/vs2019/*.dll)
 	install(FILES ${win_libs} DESTINATION ${CMAKE_INSTALL_PREFIX})
 	if(NOT ISCC)
 		set(ISCC "C:/Program Files (x86)/Inno Setup 6/ISCC.exe")