Skip to content

Commit ab731c0

Browse files
committed
Fix Windows Unix Makefiles generator builds
Using Unix Makefiles CMake generator on Windows results in a build error. Now fetched hwloc is explicitly built before the library is linked with other UMF targets.
1 parent 7e68cc8 commit ab731c0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,8 @@ else()
283283

284284
message(STATUS "hwloc CMAKE_GENERATOR: ${CMAKE_GENERATOR}")
285285

286-
if(CMAKE_GENERATOR STREQUAL "Ninja")
286+
if(CMAKE_GENERATOR STREQUAL "Ninja" OR CMAKE_GENERATOR STREQUAL
287+
"Unix Makefiles")
287288
add_custom_command(
288289
COMMAND ${CMAKE_COMMAND}
289290
-DCMAKE_INSTALL_PREFIX=${hwloc_targ_BINARY_DIR} -B build

0 commit comments

Comments
 (0)