From e27ffb5b231a44263a0b1fd3fb7ec52d7984abe3 Mon Sep 17 00:00:00 2001 From: Sebastian Junges Date: Thu, 22 Dec 2016 14:34:14 +0100 Subject: [PATCH] if hwloc is present on mac, it is also linked as otherwise, we get linker errors --- resources/3rdparty/CMakeLists.txt | 16 ++++++++-------- resources/cmake/find_modules/FindHwloc.cmake | 3 --- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/resources/3rdparty/CMakeLists.txt b/resources/3rdparty/CMakeLists.txt index e6bd1c6f5..736f2a3be 100644 --- a/resources/3rdparty/CMakeLists.txt +++ b/resources/3rdparty/CMakeLists.txt @@ -364,14 +364,14 @@ add_imported_library(sylvan STATIC ${Sylvan_LIBRARY} ${Sylvan_INCLUDE_DIR}) add_dependencies(sylvan_STATIC sylvan) list(APPEND STORM_DEP_TARGETS sylvan_STATIC) -if(${OPERATING_SYSTEM} MATCHES "Linux") - find_package(Hwloc QUIET REQUIRED) - if(HWLOC_FOUND) - message(STATUS "Storm - Linking with hwloc ${HWLOC_VERSION}.") - add_imported_library(hwloc STATIC ${HWLOC_LIBRARIES} "") - list(APPEND STORM_DEP_TARGETS hwloc_STATIC) - else() - message(FATAL_ERROR "HWLOC is required but was not found.") +find_package(Hwloc QUIET REQUIRED) +if(HWLOC_FOUND) + message(STATUS "Storm - Linking with hwloc ${HWLOC_VERSION}.") + add_imported_library(hwloc STATIC ${HWLOC_LIBRARIES} "") + list(APPEND STORM_DEP_TARGETS hwloc_STATIC) +else() + if(${OPERATING_SYSTEM} MATCHES "Linux") + message(FATAL_ERROR "HWLOC is required on Linux but was not found.") endif() endif() diff --git a/resources/cmake/find_modules/FindHwloc.cmake b/resources/cmake/find_modules/FindHwloc.cmake index 1db759375..b0027dd89 100644 --- a/resources/cmake/find_modules/FindHwloc.cmake +++ b/resources/cmake/find_modules/FindHwloc.cmake @@ -19,7 +19,6 @@ if (NOT HWLOC_PREFIX AND NOT $ENV{HWLOC_BASE} STREQUAL "") set(HWLOC_PREFIX $ENV{HWLOC_BASE}) endif() -message(STATUS "Searching for hwloc library in path " ${HWLOC_PREFIX}) find_library( HWLOC_LIBRARIES @@ -50,6 +49,4 @@ if (HWLOC_FOUND) if (NOT $ENV{HWLOC_LIB} STREQUAL "") # set(HWLOC_LIBRARIES "$ENV{HWLOC_LIB}") endif() - message(STATUS "hwloc includes: " ${HWLOC_INCLUDE_DIRS}) - message(STATUS "hwloc libraries: " ${HWLOC_LIBRARIES}) endif() \ No newline at end of file