File tree Expand file tree Collapse file tree 2 files changed +9
-3
lines changed Expand file tree Collapse file tree 2 files changed +9
-3
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' && '--proxy' || '' }}
213
+ ${{ matrix.install_tbb == 'ON' && matrix.disable_hwloc != 'ON' && matrix.shared_library == 'ON' && '--proxy' || '' }}
214
214
--umf-version ${{env.UMF_VERSION}}
215
215
${{ matrix.shared_library == 'ON' && '--shared-library' || '' }}
216
216
@@ -300,7 +300,7 @@ jobs:
300
300
--build-type ${{matrix.build_type}}
301
301
--disjoint-pool
302
302
--jemalloc-pool
303
- --proxy
303
+ ${{matrix.shared_library == 'ON' && ' --proxy' || '' }}
304
304
--umf-version ${{env.UMF_VERSION}}
305
305
${{ matrix.shared_library == 'ON' && '--shared-library' || ''}}
306
306
@@ -310,7 +310,7 @@ jobs:
310
310
shell : pwsh
311
311
312
312
- name : check /DEPENDENTLOADFLAG in umf_proxy.dll
313
- if : ${{matrix.compiler.cxx == 'cl'}}
313
+ if : ${{matrix.shared_library == 'ON' && matrix. compiler.cxx == 'cl'}}
314
314
run : ${{github.workspace}}/.github/scripts/check_dll_flags.ps1 ${{env.BUILD_DIR}}/src/proxy_lib/${{matrix.build_type}}/umf_proxy.dll
315
315
shell : pwsh
316
316
Original file line number Diff line number Diff line change @@ -436,6 +436,12 @@ endif()
436
436
# set UMF_PROXY_LIB_ENABLED
437
437
if (UMF_DISABLE_HWLOC )
438
438
message (STATUS "Disabling the proxy library, because HWLOC is disabled" )
439
+ elseif (NOT UMF_BUILD_SHARED_LIBRARY )
440
+ # TODO enable this scenario
441
+ message (
442
+ STATUS
443
+ "Disabling the proxy library, because UMF is built as static library"
444
+ )
439
445
elseif (UMF_PROXY_LIB_BASED_ON_POOL STREQUAL SCALABLE )
440
446
if (UMF_POOL_SCALABLE_ENABLED )
441
447
set (UMF_PROXY_LIB_ENABLED ON )
You can’t perform that action at this time.
0 commit comments