Merge pull request #915 from eschnett/master

Add another TBBMalloc library search path
STEllAR-GROUP · Oct 3, 2013 · 49fdfe6 · 49fdfe6
2 parents e4bee46 + ea6e5a5
commit 49fdfe6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cmake/FindHPX_TBBmalloc.cmake b/cmake/FindHPX_TBBmalloc.cmake
@@ -21,7 +21,7 @@ set(TBBMALLOC_LIB_SEARCH_PATH "")
 if(HPX_NATIVE_MIC)
   set(TBBMALLOC_LIB_SEARCH_PATH "lib/mic")
 else()
-  set(TBBMALLOC_LIB_SEARCH_PATH "lib/intel64")
+  set(TBBMALLOC_LIB_SEARCH_PATH "lib/intel64" "lib/intel64/gcc4.4")
 endif()
 
 hpx_find_package(TBBMALLOC_PROXY

diff --git a/cmake/HPX_SetAllocator.cmake b/cmake/HPX_SetAllocator.cmake
@@ -11,13 +11,13 @@
 if(NOT HPX_MALLOC)
   set(HPX_MALLOC ${HPX_MALLOC_DEFAULT})
   set(allocator_error
-      "The default allocator for your system is ${HPX_MALLOC_DEFAULT}, but ${HPX_MALLOC_DEFAULT} could not be found."
-      "The system allocator has poor performance. As such ${HPX_MALLOC_DEFAULT} is a strong optional requirement."
-      "Being aware of the performance hit, you can override this default and get rid of this dependency by setting -DHPX_MALLOC=system"
+      "The default allocator for your system is ${HPX_MALLOC_DEFAULT}, but ${HPX_MALLOC_DEFAULT} could not be found. "
+      "The system allocator has poor performance. As such ${HPX_MALLOC_DEFAULT} is a strong optional requirement. "
+      "Being aware of the performance hit, you can override this default and get rid of this dependency by setting -DHPX_MALLOC=system. "
       "Other valid options for HPX_MALLOC are: system, tcmalloc, jemalloc, tbbmalloc")
 else()
   set(allocator_error
-      "HPX_MALLOC was set to ${HPX_MALLOC}, but ${HPX_MALLOC} could not be found."
+      "HPX_MALLOC was set to ${HPX_MALLOC}, but ${HPX_MALLOC} could not be found. "
       "Other valid options for HPX_MALLOC are: system, tcmalloc, jemalloc, tbbmalloc")
 endif()