Build windows as in the good old days

Hjaltesorgenfrei · Feb 16, 2023 · 1c3e9ee · 1c3e9ee
1 parent 0ed2c2f
commit 1c3e9ee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml
@@ -31,14 +31,14 @@ jobs:
       run: cmake --no-warn-unused-cli -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE -S${{github.workspace}} -B${{github.workspace}}/build -G "Visual Studio 17 2022" -T host=x64 -A x64 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
 
     - name: Build
-      run: cmake --config ${{env.BUILD_TYPE}}    
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}    
 
     - name: Archive Release
       uses: thedoctor0/zip-release@main
       with:
         type: 'zip'
         filename: 'windows-x64-release.zip'
-        path: ${{github.workspace}}/build/Release/bin
+        path: ${{github.workspace}}/build/Release
 
     - name: Upload Release
       uses: marvinpinto/[email protected]

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,10 +11,7 @@ if(MSVC)
     if (NOT CMAKE_BUILD_TYPE) # Assume debug if dont have specified. Makes it work for vscode.
         set(CMAKE_BUILD_TYPE "Debug")
     endif()
-    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/build/${CMAKE_BUILD_TYPE}/lib)
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/build/${CMAKE_BUILD_TYPE}/lib)
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/build/${CMAKE_BUILD_TYPE}/bin)
-    set(BUILD_OUTPUT_PATH ${CMAKE_BINARY_DIR}/build/${CMAKE_BUILD_TYPE}/bin)
+    set(BUILD_OUTPUT_PATH ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE})
 else()
     set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/build/lib)
     set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/build/lib)