Skip to content

Commit 66497ef

Browse files
committed
a
1 parent 19096ce commit 66497ef

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.github/workflows/reusable_fast.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,13 @@ jobs:
7070
vcpkgDirectory: ${{env.BUILD_DIR}}/vcpkg
7171
vcpkgJsonGlob: '**/vcpkg.json'
7272

73+
- name: test
74+
if: matrix.os == 'windows-latest'
75+
run: |
76+
$env:Path
77+
echo %PATH%
78+
C:\Program Files\PowerShell\7-preview\pwsh
79+
7380
- name: Install dependencies (windows-latest)
7481
if: matrix.os == 'windows-latest'
7582
run: vcpkg install

CMakeLists.txt

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

385385
# set UMF_PROXY_LIB_ENABLED
386-
if(UMF_LINK_HWLOC_STATICALLY)
387-
message(
388-
STATUS
389-
"Disabling the proxy library, because HWLOC is set to link statically which is not supported"
390-
)
391-
elseif(UMF_DISABLE_HWLOC)
386+
if(UMF_DISABLE_HWLOC)
392387
message(STATUS "Disabling the proxy library, because HWLOC is disabled")
393388
elseif(UMF_PROXY_LIB_BASED_ON_POOL STREQUAL SCALABLE)
394389
if(UMF_POOL_SCALABLE_ENABLED)

0 commit comments

Comments
 (0)