Added config-specific output dirs

bialger · Aug 1, 2024 · 6bef6e6 · 6bef6e6
1 parent a5962ac
commit 6bef6e6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
@@ -64,7 +64,6 @@ jobs:
               if [ "${{ matrix.config.cxx }}" == "g++" ]; then
                 ./cpp_tests.exe --help
               else
-                cd Debug
                 ./cpp_tests.exe --help
               fi
           else 
@@ -79,8 +78,7 @@ jobs:
           if [ "$RUNNER_OS" == "Windows" ]; then
               if [ "${{ matrix.config.cxx }}" == "g++" ]; then
                 ./cpp_tests_tests.exe
-              else
-                cd Debug 
+              else 
                 ./cpp_tests_tests.exe
               fi
           else

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,9 +10,12 @@ project(
 set(CMAKE_CXX_STANDARD 20)
 
 if(WIN32) # Install dlls in the same directory as the executable on Windows
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
 endif()
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")