From 2c9c8eb9c44ef735c78f152e5683611469ae4f53 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Thu, 3 Oct 2013 00:34:38 -0400 Subject: [PATCH 1/2] Add more TBBMalloc search paths --- cmake/FindHPX_TBBmalloc.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/FindHPX_TBBmalloc.cmake b/cmake/FindHPX_TBBmalloc.cmake index 0af0bd25a24f..bd4ed064d834 100644 --- 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 From ea6e5a5846a78d2da7304ef31dc993649918e35d Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Thu, 3 Oct 2013 00:34:56 -0400 Subject: [PATCH 2/2] Improve HPX_MALLOC configure error messages --- cmake/HPX_SetAllocator.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/HPX_SetAllocator.cmake b/cmake/HPX_SetAllocator.cmake index 4d5d8ecc6b88..c77ec2a6d884 100644 --- 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()