diff options
| author | Tim O'Shea <tim.oshea753@gmail.com> | 2013-12-10 15:35:39 -0500 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2013-12-10 15:46:57 -0500 |
| commit | 7f9e9e19edbcfe9dc856f659f733bdd1c20d8b2c (patch) | |
| tree | c7d01aec7bc211a8ded941dd748e47e2c25a91c1 | |
| parent | cc05b53add9324e1108484a146f85c1d316020df (diff) | |
volk: clang/linux/avx fix
cmake: findIce fix (search $CMAKE_INSTALL_PREFIX first for source installed 3.5 needed for clang)
| -rw-r--r-- | cmake/Modules/FindICE.cmake | 6 | ||||
| -rw-r--r-- | volk/lib/CMakeLists.txt | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/cmake/Modules/FindICE.cmake b/cmake/Modules/FindICE.cmake index c1d18dffa1..85144b3912 100644 --- a/cmake/Modules/FindICE.cmake +++ b/cmake/Modules/FindICE.cmake @@ -39,6 +39,7 @@ FIND_PATH( ICE_INCLUDE_DIR NAMES IceUtil/IceUtil.h Ice/Ice.h NO_DEFAULT_PATH + HINTS ${CMAKE_INSTALL_PREFIX}/include HINTS ${ICE_PATH}/include ) @@ -53,26 +54,31 @@ endif(APPLE) FIND_LIBRARY( ICE_ICE ${ICE_LIB_PREFIX}Ice NO_DEFAULT_PATH + HINTS ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib64 HINTS ${ICE_PATH}/lib ${ICE_PATH}/lib64 ) FIND_LIBRARY( ICE_ICESTORM ${ICE_LIB_PREFIX}IceStorm NO_DEFAULT_PATH + HINTS ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib64 HINTS ${ICE_PATH}/lib ${ICE_PATH}/lib64 ) FIND_LIBRARY( ICE_ICEGRID ${ICE_LIB_PREFIX}IceGrid NO_DEFAULT_PATH + HINTS ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib64 HINTS ${ICE_PATH}/lib ${ICE_PATH}/lib64 ) FIND_LIBRARY( ICE_ICEUTIL ${ICE_LIB_PREFIX}IceUtil NO_DEFAULT_PATH + HINTS ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib64 HINTS ${ICE_PATH}/lib ${ICE_PATH}/lib64 ) FIND_LIBRARY( ICE_GLACIER2 Glacier2 NO_DEFAULT_PATH + HINTS ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib64 HINTS ${ICE_PATH}/lib ${ICE_PATH}/lib64 ) diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt index eda3a1026b..4ac67bcb69 100644 --- a/volk/lib/CMakeLists.txt +++ b/volk/lib/CMakeLists.txt @@ -154,7 +154,7 @@ endif() # eliminate AVX if cvtpi32_ps intrinsic fails on Apple ######################################################################## -if(${HAVE_XGETBV} AND APPLE) +if(${HAVE_XGETBV}) # check to see if the compiler/linker works with cvtpi32_ps instrinsic file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_cvtpi32_ps.c "#include <immintrin.h>\nint main (void) {__m128 __a; __m64 __b; __m128 foo = _mm_cvtpi32_ps(__a, __b); return (0); }") execute_process(COMMAND ${CMAKE_C_COMPILER} -mavx -o |