From 2d0bada9f0a4a816ab98d04d17af2d5b67a329b3 Mon Sep 17 00:00:00 2001 From: ismagom Date: Sat, 17 Jan 2015 05:52:29 -0800 Subject: [PATCH] Fixed CMake finding VOLK functions --- cmake/modules/FindVolk.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/modules/FindVolk.cmake b/cmake/modules/FindVolk.cmake index dfcef3b91..71e5d35bc 100644 --- a/cmake/modules/FindVolk.cmake +++ b/cmake/modules/FindVolk.cmake @@ -26,8 +26,11 @@ FIND_LIBRARY( # Some functions are not defined in old volk versions +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(VOLK DEFAULT_MSG VOLK_LIBRARIES VOLK_INCLUDE_DIRS) +MARK_AS_ADVANCED(VOLK_LIBRARIES VOLK_INCLUDE_DIRS VOLK_DEFINITIONS) -IF(NOT ${VOLK_LIBRARIES} STREQUAL "") +IF(VOLK_FOUND) SET(CMAKE_REQUIRED_LIBRARIES ${VOLK_LIBRARIES} m) CHECK_FUNCTION_EXISTS_MATH(volk_32f_index_max_16u HAVE_VOLK_MAX_FUNCTION) CHECK_FUNCTION_EXISTS_MATH(volk_32f_x2_max_32f HAVE_VOLK_MAX_VEC_FUNCTION) @@ -130,7 +133,4 @@ IF(NOT ${VOLK_LIBRARIES} STREQUAL "") IF(${HAVE_VOLK_ATAN_FUNCTION}) SET(VOLK_DEFINITIONS "${VOLK_DEFINITIONS}; HAVE_VOLK_ATAN_FUNCTION") ENDIF() - INCLUDE(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(VOLK DEFAULT_MSG VOLK_LIBRARIES VOLK_INCLUDE_DIRS) - MARK_AS_ADVANCED(VOLK_LIBRARIES VOLK_INCLUDE_DIRS VOLK_DEFINITIONS) -ENDIF(NOT ${VOLK_LIBRARIES} STREQUAL "") \ No newline at end of file +ENDIF(VOLK_FOUND) \ No newline at end of file