File tree Expand file tree Collapse file tree 2 files changed +2
-7
lines changed Expand file tree Collapse file tree 2 files changed +2
-7
lines changed Original file line number Diff line number Diff line change @@ -210,7 +210,7 @@ jobs:
210
210
--build-type ${{matrix.build_type}}
211
211
--disjoint-pool
212
212
--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' || '' }}
214
214
--umf-version ${{env.UMF_VERSION}}
215
215
${{ matrix.shared_library == 'ON' && '--shared-library' || '' }}
216
216
Original file line number Diff line number Diff line change @@ -434,12 +434,7 @@ if(WINDOWS)
434
434
endif ()
435
435
436
436
# set UMF_PROXY_LIB_ENABLED
437
- if (UMF_LINK_HWLOC_STATICALLY )
438
- message (
439
- STATUS
440
- "Disabling the proxy library, because HWLOC is set to link statically which is not supported"
441
- )
442
- elseif (UMF_DISABLE_HWLOC )
437
+ if (UMF_DISABLE_HWLOC )
443
438
message (STATUS "Disabling the proxy library, because HWLOC is disabled" )
444
439
elseif (UMF_PROXY_LIB_BASED_ON_POOL STREQUAL SCALABLE )
445
440
if (UMF_POOL_SCALABLE_ENABLED )
You can’t perform that action at this time.
0 commit comments