Skip to content

Commit 05ddc12

Browse files
committed
disable Proxy Lib when UMF is build as static lib
1 parent 62d7b06 commit 05ddc12

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

.github/workflows/reusable_basic.yml

Lines changed: 3 additions & 3 deletions
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' && '--proxy' || '' }}
213+
${{ matrix.install_tbb == 'ON' && matrix.disable_hwloc != 'ON' && matrix.shared_library == 'ON' && '--proxy' || '' }}
214214
--umf-version ${{env.UMF_VERSION}}
215215
${{ matrix.shared_library == 'ON' && '--shared-library' || '' }}
216216
@@ -300,7 +300,7 @@ jobs:
300300
--build-type ${{matrix.build_type}}
301301
--disjoint-pool
302302
--jemalloc-pool
303-
--proxy
303+
${{matrix.shared_library == 'ON' && '--proxy' || '' }}
304304
--umf-version ${{env.UMF_VERSION}}
305305
${{ matrix.shared_library == 'ON' && '--shared-library' || ''}}
306306
@@ -310,7 +310,7 @@ jobs:
310310
shell: pwsh
311311

312312
- name: check /DEPENDENTLOADFLAG in umf_proxy.dll
313-
if: ${{matrix.compiler.cxx == 'cl'}}
313+
if: ${{matrix.shared_library == 'ON' && matrix.compiler.cxx == 'cl'}}
314314
run: ${{github.workspace}}/.github/scripts/check_dll_flags.ps1 ${{env.BUILD_DIR}}/src/proxy_lib/${{matrix.build_type}}/umf_proxy.dll
315315
shell: pwsh
316316

CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,12 @@ endif()
436436
# set UMF_PROXY_LIB_ENABLED
437437
if(UMF_DISABLE_HWLOC)
438438
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+
)
439445
elseif(UMF_PROXY_LIB_BASED_ON_POOL STREQUAL SCALABLE)
440446
if(UMF_POOL_SCALABLE_ENABLED)
441447
set(UMF_PROXY_LIB_ENABLED ON)

0 commit comments

Comments
 (0)