Skip to content

Commit 9dd2283

Browse files
Merge pull request #1016 from bratpiorka/rrudnick_enable_win_examples
enable building examples on win static hwloc CI
2 parents 71055de + 91f14d7 commit 9dd2283

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
@@ -333,7 +333,7 @@ jobs:
333333
-B ${{env.BUILD_DIR}}
334334
-DCMAKE_INSTALL_PREFIX="${{env.INSTL_DIR}}"
335335
-DUMF_BUILD_SHARED_LIBRARY=ON
336-
-DUMF_BUILD_EXAMPLES=OFF
336+
-DUMF_BUILD_EXAMPLES=ON
337337
-DUMF_FORMAT_CODE_STYLE=OFF
338338
-DUMF_DEVELOPER_MODE=ON
339339
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
@@ -376,7 +376,7 @@ jobs:
376376
-B ${{env.BUILD_DIR}}
377377
-DCMAKE_INSTALL_PREFIX="${{env.INSTL_DIR}}"
378378
-DUMF_BUILD_SHARED_LIBRARY=OFF
379-
-DUMF_BUILD_EXAMPLES=OFF
379+
-DUMF_BUILD_EXAMPLES=ON
380380
-DUMF_FORMAT_CODE_STYLE=OFF
381381
-DUMF_DEVELOPER_MODE=ON
382382
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON

CMakeLists.txt

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

252252
set(LIBHWLOC_INCLUDE_DIRS
253253
${hwloc_targ_SOURCE_DIR}/include;${hwloc_targ_BINARY_DIR}/include)
254-
set(LIBHWLOC_LIBRARY_DIRS
255-
${hwloc_targ_BINARY_DIR}/Release;${hwloc_targ_BINARY_DIR}/Debug)
254+
set(LIBHWLOC_LIBRARY_DIRS ${hwloc_targ_BINARY_DIR}/$<CONFIG>)
255+
set(LIBHWLOC_LIBRARIES ${hwloc_targ_BINARY_DIR}/$<CONFIG>/hwloc.lib)
256256
else()
257257
include(FetchContent)
258258
message(

0 commit comments

Comments
 (0)