Recent commits broke the version argument handling, as the set variable name is different to the used variable name. First attached patch fixes this. The second one clears the variable again at the end of the macro, to match the other variables.
Alex
>From b82c9c6ff78582254a540b83fad9cc7c98b88479 Mon Sep 17 00:00:00 2001 From: Alex Merry <[email protected]> Date: Wed, 26 Feb 2014 11:41:35 +0000 Subject: [PATCH 1/2] find_dependency: use correct version variable name The code set cmake_fd_version, but used ${version}. --- Modules/CMakeFindDependencyMacro.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/CMakeFindDependencyMacro.cmake b/Modules/CMakeFindDependencyMacro.cmake index 08c4990..cf0206b 100644 --- a/Modules/CMakeFindDependencyMacro.cmake +++ b/Modules/CMakeFindDependencyMacro.cmake @@ -50,7 +50,7 @@ macro(find_dependency dep) _CMAKE_${dep}_TRANSITIVE_DEPENDENCY ) - find_package(${dep} ${version} + find_package(${dep} ${cmake_fd_version} ${cmake_fd_exact_arg} ${cmake_fd_quiet_arg} ${cmake_fd_required_arg} -- 1.9.0
>From 1cf1b5a33207e64d6bec59be659b62e8afe2ae2d Mon Sep 17 00:00:00 2001 From: Alex Merry <[email protected]> Date: Wed, 26 Feb 2014 11:41:48 +0000 Subject: [PATCH 2/2] find_dependency: unset cmake_fd_version variable at end of macro This matches the other macro variables. --- Modules/CMakeFindDependencyMacro.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/CMakeFindDependencyMacro.cmake b/Modules/CMakeFindDependencyMacro.cmake index cf0206b..9334ba3 100644 --- a/Modules/CMakeFindDependencyMacro.cmake +++ b/Modules/CMakeFindDependencyMacro.cmake @@ -65,6 +65,7 @@ macro(find_dependency dep) set(${CMAKE_FIND_PACKAGE_NAME}_FOUND False) return() endif() + set(cmake_fd_version) set(cmake_fd_required_arg) set(cmake_fd_quiet_arg) set(cmake_fd_exact_arg) -- 1.9.0
-- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
