Fixing build targets

STEllAR-GROUP · Feb 12, 2021 · f993d40 · f993d40
1 parent 1c5e0c5
commit f993d40
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 39 deletions.
diff --git a/.github/workflows/windows_debug.yml b/.github/workflows/windows_debug.yml
@@ -23,39 +23,44 @@ jobs:
     - name: Configure
       shell: bash
       run: |
-          cmake . -Bbuild -G'Visual Studio 16 2019' -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE='C:/projects/vcpkg/scripts/buildsystems/vcpkg.cmake' -DHPX_WITH_PSEUDO_DEPENDENCIES=OFF -DHPX_WITH_EXAMPLES=ON -DHPX_WITH_TESTS=ON -DHPX_WITH_TESTS_UNIT=ON -DHPX_WITH_DEPRECATION_WARNINGS=OFF -DHPX_WITH_TESTS_MAX_THREADS_PER_LOCALITY=2 -DHPX_COROUTINES_WITH_SWAP_CONTEXT_EMULATION=ON
+          cmake . -Bbuild -G'Visual Studio 16 2019' \
+            -DCMAKE_BUILD_TYPE=Debug \
+            -DCMAKE_TOOLCHAIN_FILE='C:/projects/vcpkg/scripts/buildsystems/vcpkg.cmake' \
+            -DHPX_WITH_PSEUDO_DEPENDENCIES=OFF \
+            -DHPX_WITH_EXAMPLES=ON \
+            -DHPX_WITH_TESTS=ON \
+            -DHPX_WITH_TESTS_UNIT=ON \
+            -DHPX_WITH_DEPRECATION_WARNINGS=OFF \
+            -DHPX_WITH_TESTS_MAX_THREADS_PER_LOCALITY=2 \
+            -DHPX_COROUTINES_WITH_SWAP_CONTEXT_EMULATION=ON
     - name: Build
       shell: bash
       run: |
           cmake --build build --config Debug \
           --target ALL_BUILD \
-            cmake_debug_build_dir_targets_test \
-            cmake_minsizerel_build_dir_targets_test \
-            cmake_release_build_dir_targets_test \
-            cmake_relwithdebinfo_build_dir_targets_test \
-            cmake_debug_build_dir_macros_test \
-            cmake_minsizerel_build_dir_macros_test \
-            cmake_release_build_dir_macros_test \
-            cmake_relwithdebinfo_build_dir_macros_test \
-          -- -maxcpucount -verbosity:detailed -nologo
+            cmake_debug_build_dir_targets_test.make_build_dir \
+            cmake_debug_build_dir_targets_test.make_configure \
+            cmake_debug_build_dir_targets_test.make_compile   \
+            cmake_debug_build_dir_macros_test.make_build_dir \
+            cmake_debug_build_dir_macros_test.make_configure \
+            cmake_debug_build_dir_macros_test.make_compile   \
+          -- -maxcpucount -verbosity:minimal -nologo
     - name: Install
       shell: bash
       run: |
           cmake --install build
     - name: Build External
       shell: bash
       run: |
-          cmake --build build --config Release \
+          cmake --build build --config Debug \
             --target \
-              cmake_debug_install_dir_targets_test \
-              cmake_minsizerel_install_dir_targets_test \
-              cmake_release_install_dir_targets_test \
-              cmake_relwithdebinfo_install_dir_targets_test \
-              cmake_debug_install_dir_macros_test \
-              cmake_minsizerel_install_dir_macros_test \
-              cmake_release_install_dir_macros_test \
-              cmake_relwithdebinfo_install_dir_macros_test \
-            -- -maxcpucount -verbosity:detailed -nologo
+              cmake_debug_install_dir_targets_test.make_build_dir \
+              cmake_debug_install_dir_targets_test.make_configure \
+              cmake_debug_install_dir_targets_test.make_compile   \
+              cmake_debug_install_dir_macros_test.make_build_dir \
+              cmake_debug_install_dir_macros_test.make_configure \
+              cmake_debug_install_dir_macros_test.make_compile   \
+            -- -maxcpucount -verbosity:minimal -nologo
     - name: Test
       shell: bash
       run: |

diff --git a/.github/workflows/windows_release.yml b/.github/workflows/windows_release.yml
@@ -23,21 +23,27 @@ jobs:
     - name: Configure
       shell: bash
       run: |
-          cmake . -Bbuild -G'Visual Studio 16 2019' -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE='C:/projects/vcpkg/scripts/buildsystems/vcpkg.cmake' -DHPX_WITH_PSEUDO_DEPENDENCIES=OFF -DHPX_WITH_EXAMPLES=ON -DHPX_WITH_TESTS=ON -DHPX_WITH_TESTS_UNIT=ON -DHPX_WITH_DEPRECATION_WARNINGS=OFF -DHPX_WITH_TESTS_MAX_THREADS_PER_LOCALITY=2
+          cmake . -Bbuild -G'Visual Studio 16 2019' \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_TOOLCHAIN_FILE='C:/projects/vcpkg/scripts/buildsystems/vcpkg.cmake' \
+            -DHPX_WITH_PSEUDO_DEPENDENCIES=OFF \
+            -DHPX_WITH_EXAMPLES=ON \
+            -DHPX_WITH_TESTS=ON \
+            -DHPX_WITH_TESTS_UNIT=ON \
+            -DHPX_WITH_DEPRECATION_WARNINGS=OFF \
+            -DHPX_WITH_TESTS_MAX_THREADS_PER_LOCALITY=2
     - name: Build
       shell: bash
       run: |
           cmake --build build --config Release \
           --target ALL_BUILD \
-            cmake_debug_build_dir_targets_test \
-            cmake_minsizerel_build_dir_targets_test \
-            cmake_release_build_dir_targets_test \
-            cmake_relwithdebinfo_build_dir_targets_test \
-            cmake_debug_build_dir_macros_test \
-            cmake_minsizerel_build_dir_macros_test \
-            cmake_release_build_dir_macros_test \
-            cmake_relwithdebinfo_build_dir_macros_test \
-          -- -maxcpucount -verbosity:detailed -nologo
+            cmake_release_build_dir_targets_test.make_build_dir \
+            cmake_release_build_dir_targets_test.make_configure \
+            cmake_release_build_dir_targets_test.make_compile   \
+            cmake_release_build_dir_macros_test.make_build_dir \
+            cmake_release_build_dir_macros_test.make_configure \
+            cmake_release_build_dir_macros_test.make_compile   \
+          -- -maxcpucount -verbosity:minimal -nologo
     - name: Install
       shell: bash
       run: |
@@ -47,15 +53,13 @@ jobs:
       run: |
           cmake --build build --config Release \
             --target \
-              cmake_debug_install_dir_targets_test \
-              cmake_minsizerel_install_dir_targets_test \
-              cmake_release_install_dir_targets_test \
-              cmake_relwithdebinfo_install_dir_targets_test \
-              cmake_debug_install_dir_macros_test \
-              cmake_minsizerel_install_dir_macros_test \
-              cmake_release_install_dir_macros_test \
-              cmake_relwithdebinfo_install_dir_macros_test \
-            -- -maxcpucount -verbosity:detailed -nologo
+              cmake_release_install_dir_targets_test.make_build_dir \
+              cmake_release_install_dir_targets_test.make_configure \
+              cmake_release_install_dir_targets_test.make_compile   \
+              cmake_release_install_dir_macros_test.make_build_dir \
+              cmake_release_install_dir_macros_test.make_configure \
+              cmake_release_install_dir_macros_test.make_compile   \
+            -- -maxcpucount -verbosity:minimal -nologo
     - name: Test
       shell: bash
       run: |