Merge pull request #6603 from SAtacker/macos_ci_fix

Remove unnecessary autoreconf
STEllAR-GROUP · Jan 24, 2025 · 714b7c8 · 714b7c8
2 parents 62f6d6a + 6ff86bc
commit 714b7c8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/.github/workflows/macos_debug_fetch_hwloc.yml b/.github/workflows/macos_debug_fetch_hwloc.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Install dependencies
       run: |
           brew install --overwrite python-tk && \
-          brew install --overwrite boost gperftools ninja autoconf automake libtool && \
+          brew install --overwrite boost gperftools ninja autoconf automake pkgconf libtool && \
           brew upgrade cmake
     - name: Configure
       shell: bash
@@ -36,6 +36,7 @@ jobs:
               -DHPX_WITH_VERIFY_LOCKS=ON \
               -DHPX_WITH_VERIFY_LOCKS_BACKTRACE=ON \
               -DHPX_WITH_CHECK_MODULE_DEPENDENCIES=ON
+          cd build/_deps/hwloc-src/ && autoreconf -f -i
     - name: Build
       shell: bash
       run: |

diff --git a/cmake/HPX_SetupHwloc.cmake b/cmake/HPX_SetupHwloc.cmake
@@ -44,11 +44,21 @@ else()
     )
     if(NOT HWLoc_POPULATED)
       fetchcontent_populate(HWLoc)
-      execute_process(
-        COMMAND
-          sh -c
-          "cd ${FETCHCONTENT_BASE_DIR}/hwloc-src && autoreconf -f -i && ./configure --prefix=${FETCHCONTENT_BASE_DIR}/hwloc-installed && make -j && make install"
-      )
+      if(NOT Hwloc_BUILD_INSTALLED)
+        execute_process(
+          COMMAND
+            sh -c
+            "cd ${FETCHCONTENT_BASE_DIR}/hwloc-src && ./configure --prefix=${FETCHCONTENT_BASE_DIR}/hwloc-installed && make -j && make install"
+        )
+        set(Hwloc_BUILD_INSTALLED
+            TRUE
+            CACHE INTERNAL ""
+        )
+      else()
+        message(
+          "HWLoc is installed at ${FETCHCONTENT_BASE_DIR}/hwloc-installed"
+        )
+      endif()
     endif()
     set(HWLOC_ROOT "${FETCHCONTENT_BASE_DIR}/hwloc-installed")
     set(Hwloc_INCLUDE_DIR