Skip to content

Commit 00c98a0

Browse files
committed
enable Proxy with static HWLOC
1 parent 4e7bf20 commit 00c98a0

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

.github/workflows/reusable_basic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ jobs:
210210
--build-type ${{matrix.build_type}}
211211
--disjoint-pool
212212
--jemalloc-pool
213-
${{ matrix.install_tbb == 'ON' && matrix.disable_hwloc != 'ON' && matrix.link_hwloc_statically != 'ON' && '--proxy' || '' }}
213+
${{ matrix.install_tbb == 'ON' && matrix.disable_hwloc != 'ON' && '--proxy' || '' }}
214214
--umf-version ${{env.UMF_VERSION}}
215215
${{ matrix.shared_library == 'ON' && '--shared-library' || '' }}
216216

CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -376,12 +376,7 @@ if(WINDOWS)
376376
endif()
377377

378378
# set UMF_PROXY_LIB_ENABLED
379-
if(UMF_LINK_HWLOC_STATICALLY)
380-
message(
381-
STATUS
382-
"Disabling the proxy library, because HWLOC is set to link statically which is not supported"
383-
)
384-
elseif(UMF_DISABLE_HWLOC)
379+
if(UMF_DISABLE_HWLOC)
385380
message(STATUS "Disabling the proxy library, because HWLOC is disabled")
386381
elseif(UMF_PROXY_LIB_BASED_ON_POOL STREQUAL SCALABLE)
387382
if(UMF_POOL_SCALABLE_ENABLED)

0 commit comments

Comments
 (0)