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:
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
Original file line number Diff line number Diff line change @@ -378,6 +378,12 @@ endif()
378378# set UMF_PROXY_LIB_ENABLED
379379if (UMF_DISABLE_HWLOC)
380380 message (STATUS "Disabling the proxy library, because HWLOC is disabled" )
381+ elseif (NOT UMF_BUILD_SHARED_LIBRARY)
382+ # TODO enable this scenario
383+ message (
384+ STATUS
385+ "Disabling the proxy library, because UMF is built as static library"
386+ )
381387elseif (UMF_PROXY_LIB_BASED_ON_POOL STREQUAL SCALABLE)
382388 if (UMF_POOL_SCALABLE_ENABLED)
383389 set (UMF_PROXY_LIB_ENABLED ON )
You can’t perform that action at this time.
0 commit comments