Skip to content

Commit e09fce9

Browse files
CMake: set more hwloc paths for Unix Makefile on Win
1 parent ace9f4a commit e09fce9

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

CMakeLists.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,9 +321,17 @@ else()
321321
elseif(CMAKE_GENERATOR STREQUAL "NMake Makefiles")
322322
set(LIBHWLOC_LIBRARY_DIRS ${hwloc_targ_BINARY_DIR}/)
323323
set(LIBHWLOC_LIBRARIES ${hwloc_targ_BINARY_DIR}/hwloc.lib)
324-
else()
324+
elseif(CMAKE_GENERATOR MATCHES "Visual Studio")
325325
set(LIBHWLOC_LIBRARY_DIRS ${hwloc_targ_BINARY_DIR}/$<CONFIG>)
326326
set(LIBHWLOC_LIBRARIES ${hwloc_targ_BINARY_DIR}/$<CONFIG>/hwloc.lib)
327+
elseif(CMAKE_GENERATOR MATCHES "Unix Makefiles")
328+
set(LIBHWLOC_LIBRARY_DIRS ${hwloc_targ_BINARY_DIR}/lib)
329+
set(LIBHWLOC_LIBRARIES ${hwloc_targ_BINARY_DIR}/lib/hwloc.lib)
330+
else()
331+
set(LIBHWLOC_LIBRARY_DIRS
332+
${hwloc_targ_BINARY_DIR}/$<CONFIG>;${hwloc_targ_BINARY_DIR}/$<CONFIG>/lib;${hwloc_targ_BINARY_DIR}/lib;${hwloc_targ_BINARY_DIR}/Release;${hwloc_targ_BINARY_DIR}/Debug;${hwloc_targ_BINARY_DIR}/Release/lib;${hwloc_targ_BINARY_DIR}/Debug/lib;${hwloc_targ_BINARY_DIR}/lib/Release;${hwloc_targ_BINARY_DIR}/lib/Debug
333+
)
334+
set(LIBHWLOC_LIBRARIES hwloc.lib)
327335
endif()
328336

329337
set(LIBHWLOC_INCLUDE_DIRS

0 commit comments

Comments
 (0)