First use pkgconfig to find libraries

Signed-off-by: Lukasz Dorau <[email protected]>

Author: ldorau

CMakeLists.txt

@@ -114,13 +114,17 @@ install(
     EXPORT ${PROJECT_NAME}-targets)
 
 if(UMF_BUILD_OS_MEMORY_PROVIDER AND (LINUX OR WINDOWS))
-    # Do not use pkgconfig, because it sets wrong paths on Windows
-    find_package(LIBHWLOC REQUIRED hwloc)
+    pkg_check_modules(LIBHWLOC hwloc)
+    if(NOT LIBHWLOC_FOUND)
+        find_package(LIBHWLOC REQUIRED hwloc)
+    endif()
 endif()
 
 if(UMF_BUILD_LIBUMF_POOL_SCALABLE AND (LINUX OR WINDOWS))
-    # Do not use pkgconfig, because it sets wrong paths on Windows
-    find_package(LIBTBB REQUIRED tbb)
+    pkg_check_modules(TBB tbb)
+    if(NOT TBB_FOUND)
+        find_package(TBB REQUIRED tbb)
+    endif()
 endif()
 
 add_subdirectory(src)

benchmark/CMakeLists.txt

@@ -30,8 +30,15 @@ add_dependencies(ubench
 	umf
 	${LIBS_OPTIONAL})
 
+if(UMF_BUILD_OS_MEMORY_PROVIDER)
+    set(LIBS_OPTIONAL ${LIBS_OPTIONAL} ${LIBHWLOC_LIBRARIES})
+    set(LIB_DIRS_OPTIONAL ${LIB_DIRS_OPTIONAL} ${LIBHWLOC_LIBRARY_DIRS})
+endif()
+
 target_include_directories(ubench PRIVATE ${UMF_CMAKE_SOURCE_DIR}/include/ ${UMF_CMAKE_SOURCE_DIR}/src/utils/)
 
+target_link_directories(ubench PRIVATE ${LIB_DIRS_OPTIONAL})
+
 target_link_libraries(ubench
 	umf
 	${LIBS_OPTIONAL}
@@ -40,6 +47,7 @@ target_link_libraries(ubench
 
 if (UMF_BUILD_BENCHMARKS_MT)
 	add_executable(multithread_bench multithread.cpp)
+	target_link_directories(multithread_bench PRIVATE ${LIB_DIRS_OPTIONAL})
 	target_link_libraries(multithread_bench
 		umf
 		${LIBS_OPTIONAL}

cmake/FindLIBHWLOC.cmake

@@ -7,6 +7,9 @@ message(STATUS "Checking for module 'libhwloc' using find_library()")
 find_library(LIBHWLOC_LIBRARY NAMES libhwloc hwloc)
 set(LIBHWLOC_LIBRARIES ${LIBHWLOC_LIBRARY})
 
+get_filename_component(LIBHWLOC_LIB_DIR ${LIBHWLOC_LIBRARIES} DIRECTORY)
+set(LIBHWLOC_LIBRARY_DIRS ${LIBHWLOC_LIB_DIR})
+
 find_file(LIBHWLOC_HEADER NAMES hwloc.h)
 get_filename_component(LIBHWLOC_INCLUDE_DIR ${LIBHWLOC_HEADER} DIRECTORY)
 set(LIBHWLOC_INCLUDE_DIRS ${LIBHWLOC_INCLUDE_DIR})
@@ -21,6 +24,7 @@ if(LIBHWLOC_LIBRARY)
 	message(STATUS "  Found libhwloc using find_library()")
 	message(STATUS "    LIBHWLOC_LIBRARIES = ${LIBHWLOC_LIBRARIES}")
 	message(STATUS "    LIBHWLOC_INCLUDE_DIRS = ${LIBHWLOC_INCLUDE_DIRS}")
+	message(STATUS "    LIBHWLOC_LIBRARY_DIRS = ${LIBHWLOC_LIBRARY_DIRS}")
 	if(WINDOWS)
 		message(STATUS "    LIBHWLOC_DLL_DIRS = ${LIBHWLOC_DLL_DIRS}")
 	endif()

examples/CMakeLists.txt

@@ -2,18 +2,21 @@
 # Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-if(UMF_BUILD_OS_MEMORY_PROVIDER
-        AND UMF_BUILD_LIBUMF_POOL_SCALABLE
-        AND UMF_ENABLE_POOL_TRACKING)
+if(UMF_BUILD_OS_MEMORY_PROVIDER AND UMF_BUILD_LIBUMF_POOL_SCALABLE AND UMF_ENABLE_POOL_TRACKING)
    set(EXAMPLE_NAME umf_example_basic)
+
    add_umf_executable(NAME ${EXAMPLE_NAME}
                       SRCS basic/basic.c
                       LIBS umf
+                           ${LIBHWLOC_LIBRARIES}
                            scalable_pool)
+
     target_include_directories(${EXAMPLE_NAME} PRIVATE
         ${UMF_CMAKE_SOURCE_DIR}/src/utils
         ${UMF_CMAKE_SOURCE_DIR}/include)
 
+    target_link_directories(${EXAMPLE_NAME} PRIVATE ${LIBHWLOC_LIBRARY_DIRS})
+
     add_test(NAME ${EXAMPLE_NAME}
              COMMAND ${EXAMPLE_NAME}
              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
@@ -23,11 +26,11 @@ if(UMF_BUILD_OS_MEMORY_PROVIDER
     if(WINDOWS)
         # append PATH to DLLs
         set(DLL_PATH_LIST "PATH=path_list_append:../bin/$<CONFIG>")
-        if(LIBHWLOC_DLL_DIRS)
-            set(DLL_PATH_LIST "${DLL_PATH_LIST};PATH=path_list_append:${LIBHWLOC_DLL_DIRS}")
+        if(LIBHWLOC_LIBRARY_DIRS)
+            set(DLL_PATH_LIST "${DLL_PATH_LIST};PATH=path_list_append:${LIBHWLOC_LIBRARY_DIRS}/../bin")
         endif()
-        if(LIBTBB_DLL_DIRS)
-            set(DLL_PATH_LIST "${DLL_PATH_LIST};PATH=path_list_append:${LIBTBB_DLL_DIRS}")
+        if(TBB_LIBRARY_DIRS)
+            set(DLL_PATH_LIST "${DLL_PATH_LIST};PATH=path_list_append:${TBB_LIBRARY_DIRS}/../bin")
         endif()
         set_property(TEST ${EXAMPLE_NAME} PROPERTY ENVIRONMENT_MODIFICATION "${DLL_PATH_LIST}")
     endif()

src/CMakeLists.txt

@@ -72,6 +72,7 @@ if(UMF_BUILD_OS_MEMORY_PROVIDER)
         set(UMF_LIBS ${UMF_LIBS} ${LIBHWLOC_LIBRARIES})
         # Currently, OS provider is only built for Linux and Windows
         set(UMF_PUBLIC_COMPILE_DEFINITIONS ${UMF_PUBLIC_COMPILE_DEFINITIONS} "UMF_BUILD_OS_MEMORY_PROVIDER=1")
+        set(UMF_PRIVATE_LIBRARY_DIRS ${UMF_PRIVATE_LIBRARY_DIRS} ${LIBHWLOC_LIBRARY_DIRS})
     endif()
 endif()
 
@@ -121,6 +122,8 @@ else()
                     LIBS ${UMF_LIBS})
 endif()
 
+target_link_directories(umf PRIVATE ${UMF_PRIVATE_LIBRARY_DIRS})
+
 target_compile_definitions(umf PUBLIC ${UMF_PUBLIC_COMPILE_DEFINITIONS})
 
 if (UMF_ENABLE_POOL_TRACKING)

src/pool/CMakeLists.txt

@@ -65,7 +65,7 @@ if(UMF_BUILD_LIBUMF_POOL_SCALABLE)
                         TYPE STATIC
                         SRCS pool_scalable.c ${POOL_EXTRA_SRCS}
                         LIBS ${LIBS_POOL_SCALABLE})
-        target_include_directories(scalable_pool PRIVATE ${LIBTBB_INCLUDE_DIRS})
+        target_include_directories(scalable_pool PRIVATE ${TBB_INCLUDE_DIRS})
         target_compile_definitions(scalable_pool PUBLIC ${POOL_COMPILE_DEFINITIONS})
         add_library(${PROJECT_NAME}::scalable_pool ALIAS scalable_pool)
         install(TARGETS scalable_pool

test/CMakeLists.txt

@@ -31,12 +31,22 @@ function(add_umf_test)
     set(TEST_NAME umf-${ARG_NAME})
     set(TEST_TARGET_NAME umf_test-${ARG_NAME})
 
+    if(UMF_BUILD_OS_MEMORY_PROVIDER)
+        set(LIBS_OPTIONAL ${LIBS_OPTIONAL} ${LIBHWLOC_LIBRARIES})
+        set(LIB_DIRS_OPTIONAL ${LIB_DIRS_OPTIONAL} ${LIBHWLOC_LIBRARY_DIRS})
+    endif()
+
     set(TEST_LIBS test_common
         umf
         GTest::gtest_main
+        ${LIBS_OPTIONAL}
         ${ARG_LIBS})
     add_umf_executable(NAME ${TEST_TARGET_NAME} SRCS ${ARG_SRCS} LIBS ${TEST_LIBS})
 
+    if(LIB_DIRS_OPTIONAL)
+        target_link_directories(${TEST_TARGET_NAME} PRIVATE ${LIB_DIRS_OPTIONAL})
+    endif()
+
     target_include_directories(${TEST_TARGET_NAME} PRIVATE
         ${UMF_CMAKE_SOURCE_DIR}/include
         ${UMF_CMAKE_SOURCE_DIR}/src
@@ -52,11 +62,11 @@ function(add_umf_test)
 
     if(WIN32)
         set(PATH_LIST "PATH=path_list_append:../bin/$<CONFIG>")
-        if(LIBHWLOC_DLL_DIRS)
-            set(PATH_LIST "${PATH_LIST};PATH=path_list_append:${LIBHWLOC_DLL_DIRS}")
+        if(LIBHWLOC_LIBRARY_DIRS)
+            set(PATH_LIST "${PATH_LIST};PATH=path_list_append:${LIBHWLOC_LIBRARY_DIRS}/../bin")
         endif()
-        if(LIBTBB_DLL_DIRS)
-            set(PATH_LIST "${PATH_LIST};PATH=path_list_append:${LIBTBB_DLL_DIRS}")
+        if(TBB_LIBRARY_DIRS)
+            set(PATH_LIST "${PATH_LIST};PATH=path_list_append:${TBB_LIBRARY_DIRS}/../bin")
         endif()
         set_property(TEST ${TEST_NAME} PROPERTY ENVIRONMENT_MODIFICATION "${PATH_LIST}")
     endif()