Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unnecessary autoreconf #6603

Merged
merged 1 commit into from
Jan 24, 2025
+17 −6
Merged

Remove unnecessary autoreconf #6603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/macos_debug_fetch_hwloc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand Down
20 changes: 15 additions & 5 deletions cmake/HPX_SetupHwloc.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading