diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt --- a/openmp/runtime/src/CMakeLists.txt +++ b/openmp/runtime/src/CMakeLists.txt @@ -198,7 +198,11 @@ else() set(LIBOMP_LIBRARY_DIR ${LIBOMP_LIBRARY_DIR} PARENT_SCOPE) endif() -set(LIBOMP_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) +if(${LIBOMP_USE_HWLOC}) + set(LIBOMP_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} ${LIBOMP_HWLOC_INSTALL_DIR}/include PARENT_SCOPE) +else() + set(LIBOMP_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) +endif() # Add symbolic links to libomp if(NOT WIN32) @@ -210,7 +214,11 @@ WORKING_DIRECTORY ${LIBOMP_LIBRARY_DIR} ) endif() -set(LIBOMP_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) +if(${LIBOMP_USE_HWLOC}) + set(LIBOMP_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} ${LIBOMP_HWLOC_INSTALL_DIR}/include PARENT_SCOPE) +else() + set(LIBOMP_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) +endif() # Create *.inc before compiling any sources # objects depend on : .inc files