Skip to content

Commit 380dc0f

Browse files
PatKaminlukaszstolarczuk
authored andcommitted
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 ace9f4a commit 380dc0f

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
@@ -284,7 +284,8 @@ else()
284284

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

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

0 commit comments

Comments
 (0)