From ada63d7e744066953923e04c8a0b0cd2f30757e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Stolarczuk?= Date: Fri, 24 Jan 2025 12:58:01 +0100 Subject: [PATCH] Revert changes for Win static hwloc 1. "enable building examples on win static hwloc CI" This reverts commit 58ba8e9ff09205dc1ccf4c998485e17ae894e7d5. 2. "fix setting LIBHWLOC_LIBRARIES on Windows" This reverts commit 91f14d7d8039dc07f0a0595f0f2f441e7d526930. Ref. #1016 --- .github/workflows/reusable_basic.yml | 4 ++-- CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/reusable_basic.yml b/.github/workflows/reusable_basic.yml index 22bf0ea505..02f79bad0e 100644 --- a/.github/workflows/reusable_basic.yml +++ b/.github/workflows/reusable_basic.yml @@ -338,7 +338,7 @@ jobs: -B ${{env.BUILD_DIR}} -DCMAKE_INSTALL_PREFIX="${{env.INSTL_DIR}}" -DUMF_BUILD_SHARED_LIBRARY=ON - -DUMF_BUILD_EXAMPLES=ON + -DUMF_BUILD_EXAMPLES=OFF -DUMF_FORMAT_CODE_STYLE=OFF -DUMF_DEVELOPER_MODE=ON -DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON @@ -381,7 +381,7 @@ jobs: -B ${{env.BUILD_DIR}} -DCMAKE_INSTALL_PREFIX="${{env.INSTL_DIR}}" -DUMF_BUILD_SHARED_LIBRARY=OFF - -DUMF_BUILD_EXAMPLES=ON + -DUMF_BUILD_EXAMPLES=OFF -DUMF_FORMAT_CODE_STYLE=OFF -DUMF_DEVELOPER_MODE=ON -DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON diff --git a/CMakeLists.txt b/CMakeLists.txt index ac7bcbf933..c24fceb731 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -281,8 +281,8 @@ else() set(LIBHWLOC_INCLUDE_DIRS ${hwloc_targ_SOURCE_DIR}/include;${hwloc_targ_BINARY_DIR}/include) - set(LIBHWLOC_LIBRARY_DIRS ${hwloc_targ_BINARY_DIR}/$) - set(LIBHWLOC_LIBRARIES ${hwloc_targ_BINARY_DIR}/$/hwloc.lib) + set(LIBHWLOC_LIBRARY_DIRS + ${hwloc_targ_BINARY_DIR}/Release;${hwloc_targ_BINARY_DIR}/Debug) else() include(FetchContent) message(