use *_DLL_DIRS env

Author: bratpiorka

CMakeLists.txt

@@ -117,7 +117,7 @@ if(NOT UMF_LINK_HWLOC_STATICALLY)
 
         # add PATH to DLL on Windows
         set(DLL_PATH_LIST
-            "${DLL_PATH_LIST};PATH=path_list_append:${LIBHWLOC_LIBRARY_DIRS}/../bin"
+            "${DLL_PATH_LIST};PATH=path_list_append:${LIBHWLOC_DLL_DIRS}"
         )
     endif()
     # add PATH to DLL on Windows
@@ -337,7 +337,7 @@ endif()
 if(TBB_FOUND OR TBB_LIBRARY_DIRS)
     # add PATH to DLL on Windows
     set(DLL_PATH_LIST
-        "${DLL_PATH_LIST};PATH=path_list_append:${TBB_LIBRARY_DIRS}/../bin")
+        "${DLL_PATH_LIST};PATH=path_list_append:${TBB_DLL_DIRS}")
     set(UMF_POOL_SCALABLE_ENABLED TRUE)
 else()
     message(
@@ -354,7 +354,7 @@ if(UMF_BUILD_LIBUMF_POOL_JEMALLOC)
     endif()
     # add PATH to DLL on Windows
     set(DLL_PATH_LIST
-        "${DLL_PATH_LIST};PATH=path_list_append:${JEMALLOC_LIBRARY_DIRS}/../bin"
+        "${DLL_PATH_LIST};PATH=path_list_append:${JEMALLOC_DLL_DIRS}"
     )
 endif()
 

cmake/FindJEMALLOC.cmake

@@ -28,7 +28,7 @@ else()
 endif()
 
 if(WINDOWS)
-    find_file(JEMALLOC_DLL NAMES "bin/jemalloc.dll")
+    find_file(JEMALLOC_DLL NAMES "bin/jemalloc.dll" "jemalloc.dll")
     get_filename_component(JEMALLOC_DLL_DIR ${JEMALLOC_DLL} DIRECTORY)
     set(JEMALLOC_DLL_DIRS ${JEMALLOC_DLL_DIR})
 endif()

cmake/FindTBB.cmake

@@ -26,7 +26,7 @@ else()
 endif()
 
 if(WINDOWS)
-    find_file(TBB_DLL NAMES "bin/tbbmalloc.dll")
+    find_file(TBB_DLL NAMES "bin/tbbmalloc.dll" "tbbmalloc.dll")
     get_filename_component(TBB_DLL_DIR ${TBB_DLL} DIRECTORY)
     set(TBB_DLL_DIRS ${TBB_DLL_DIR})
 endif()

examples/cmake/FindLIBHWLOC.cmake

@@ -38,7 +38,7 @@ try_run(
     RUN_OUTPUT_VARIABLE LIBHWLOC_API_VERSION)
 
 if(WINDOWS)
-    find_file(LIBHWLOC_DLL NAMES "bin/hwloc-15.dll" "bin/libhwloc-15.dll")
+    find_file(LIBHWLOC_DLL NAMES "bin/hwloc-15.dll" "bin/libhwloc-15.dll" "hwloc-15.dll" "libhwloc-15.dll")
     get_filename_component(LIBHWLOC_DLL_DIR ${LIBHWLOC_DLL} DIRECTORY)
     set(LIBHWLOC_DLL_DIRS ${LIBHWLOC_DLL_DIR})
 endif()

examples/cmake/FindTBB.cmake

@@ -26,7 +26,7 @@ else()
 endif()
 
 if(WINDOWS)
-    find_file(TBB_DLL NAMES "bin/tbbmalloc.dll")
+    find_file(TBB_DLL NAMES "bin/tbbmalloc.dll" "tbbmalloc.dll")
     get_filename_component(TBB_DLL_DIR ${TBB_DLL} DIRECTORY)
     set(TBB_DLL_DIRS ${TBB_DLL_DIR})
 endif()