Skip to content

Commit ada63d7

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. #1016
1 parent 4af372f commit ada63d7

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
@@ -338,7 +338,7 @@ jobs:
338338
-B ${{env.BUILD_DIR}}
339339
-DCMAKE_INSTALL_PREFIX="${{env.INSTL_DIR}}"
340340
-DUMF_BUILD_SHARED_LIBRARY=ON
341-
-DUMF_BUILD_EXAMPLES=ON
341+
-DUMF_BUILD_EXAMPLES=OFF
342342
-DUMF_FORMAT_CODE_STYLE=OFF
343343
-DUMF_DEVELOPER_MODE=ON
344344
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
@@ -381,7 +381,7 @@ jobs:
381381
-B ${{env.BUILD_DIR}}
382382
-DCMAKE_INSTALL_PREFIX="${{env.INSTL_DIR}}"
383383
-DUMF_BUILD_SHARED_LIBRARY=OFF
384-
-DUMF_BUILD_EXAMPLES=ON
384+
-DUMF_BUILD_EXAMPLES=OFF
385385
-DUMF_FORMAT_CODE_STYLE=OFF
386386
-DUMF_DEVELOPER_MODE=ON
387387
-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)