Skip to content

Commit 917ac1d

Browse files
Revert changes for Win static hwloc
1. "enable building examples on win static hwloc CI" This reverts commit 58ba8e9. 2. "fix setting LIBHWLOC_LIBRARIES on Windows" This reverts commit 91f14d7. Ref. oneapi-src#1016
1 parent 815695b commit 917ac1d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/reusable_basic.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ jobs:
339339
-B ${{env.BUILD_DIR}}
340340
-DCMAKE_INSTALL_PREFIX="${{env.INSTL_DIR}}"
341341
-DUMF_BUILD_SHARED_LIBRARY=ON
342-
-DUMF_BUILD_EXAMPLES=ON
342+
-DUMF_BUILD_EXAMPLES=OFF
343343
-DUMF_FORMAT_CODE_STYLE=OFF
344344
-DUMF_DEVELOPER_MODE=ON
345345
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
@@ -382,7 +382,7 @@ jobs:
382382
-B ${{env.BUILD_DIR}}
383383
-DCMAKE_INSTALL_PREFIX="${{env.INSTL_DIR}}"
384384
-DUMF_BUILD_SHARED_LIBRARY=OFF
385-
-DUMF_BUILD_EXAMPLES=ON
385+
-DUMF_BUILD_EXAMPLES=OFF
386386
-DUMF_FORMAT_CODE_STYLE=OFF
387387
-DUMF_DEVELOPER_MODE=ON
388388
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ else()
281281

282282
set(LIBHWLOC_INCLUDE_DIRS
283283
${hwloc_targ_SOURCE_DIR}/include;${hwloc_targ_BINARY_DIR}/include)
284-
set(LIBHWLOC_LIBRARY_DIRS ${hwloc_targ_BINARY_DIR}/$<CONFIG>)
285-
set(LIBHWLOC_LIBRARIES ${hwloc_targ_BINARY_DIR}/$<CONFIG>/hwloc.lib)
284+
set(LIBHWLOC_LIBRARY_DIRS
285+
${hwloc_targ_BINARY_DIR}/Release;${hwloc_targ_BINARY_DIR}/Debug)
286286
else()
287287
include(FetchContent)
288288
message(

0 commit comments

Comments
 (0)