Use VIENNACL_ENCODED_VERSION for VIENNACL_VERSION macro

shogun-toolbox · Mar 10, 2016 · 1246af9 · 1246af9
1 parent ab16923
commit 1246af9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -573,7 +573,6 @@ OPTION(ENABLE_VIENNACL "Enable ViennaCL" ON)
 FIND_PACKAGE(ViennaCL ${VIENNACL_VERSION_MINIMUM})
 IF (VIENNACL_FOUND AND ENABLE_VIENNACL)
 	SET(HAVE_VIENNACL 1)
-	SET(VIENNACL_VERSION ${VIENNACL_ENCODED_VERSION})
 	LIST(APPEND INCLUDES ${VIENNACL_INCLUDE_DIRS})
 	SET(POSTLINKFLAGS ${POSTLINKFLAGS} ${VIENNACL_LIBRARIES})
 	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OPENCL_C_FLAGS}")

diff --git a/cmake/FindViennaCL.cmake b/cmake/FindViennaCL.cmake
@@ -35,7 +35,6 @@ ELSE (WIN32) #Linux
 			DOC "The ViennaCL include path")
 ENDIF (WIN32)
 
-# TODO: viennacl currently doesn't store the version of itself in the header
 IF (VIENNACL_INCLUDE_DIR)
 	SET(CMAKE_REQUIRED_INCLUDES ${VIENNACL_INCLUDE_DIR})
 
@@ -74,12 +73,12 @@ if(VIENNACL_WITH_OPENCL)
 	set(VIENNACL_INCLUDE_DIRS ${VIENNACL_INCLUDE_DIR} ${OPENCL_INCLUDE_DIRS})
 	set(VIENNACL_LIBRARIES ${OPENCL_LIBRARIES})
 	find_package_handle_standard_args(ViennaCL REQUIRED_VARS
-			VIENNACL_INCLUDE_DIR OPENCL_INCLUDE_DIRS OPENCL_LIBRARIES
+			VIENNACL_INCLUDE_DIR VIENNACL_ENCODED_VERSION OPENCL_INCLUDE_DIRS OPENCL_LIBRARIES
 			VERSION_VAR VIENNACL_VERSION)
 else(VIENNACL_WITH_OPENCL)
 	set(VIENNACL_INCLUDE_DIRS ${VIENNACL_INCLUDE_DIR})
 	set(VIENNACL_LIBRARIES "")
-	find_package_handle_standard_args(ViennaCL REQUIRED_VARS VIENNACL_INCLUDE_DIR VERSION_VAR VIENNACL_VERSION)
+	find_package_handle_standard_args(ViennaCL REQUIRED_VARS VIENNACL_INCLUDE_DIR VIENNACL_ENCODED_VERSION VERSION_VAR VIENNACL_VERSION)
 endif(VIENNACL_WITH_OPENCL)
 
-MARK_AS_ADVANCED(VIENNACL_INCLUDE_DIR)
+MARK_AS_ADVANCED(VIENNACL_INCLUDE_DIR VIENNACL_ENCODED_VERSION)
diff --git a/src/shogun/lib/config.h.in b/src/shogun/lib/config.h.in
@@ -21,7 +21,7 @@
 
 #cmakedefine HAVE_ARPACK 1
 #cmakedefine HAVE_VIENNACL 1
-#cmakedefine VIENNACL_VERSION @VIENNACL_VERSION@
+#cmakedefine VIENNACL_VERSION @VIENNACL_ENCODED_VERSION@
 #cmakedefine HAVE_OPENCV 1
 #cmakedefine HAVE_CATLAS 1
 #cmakedefine HAVE_ATLAS 1