summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-02-26 10:32:56 -0500
committerBrad King <brad.king@kitware.com>2014-02-26 10:32:56 -0500
commit948d5d18fd6deed24ede54cb0e3b017511f99559 (patch)
tree70385f771629272b9692c67b077232019527c0f8
parentbfb3f19c43a8b4f19bdbbe04d1adc444178340f3 (diff)
parent3d8f7102bb8335f090f12ced25572df799448ca6 (diff)
downloadcmake-948d5d18fd6deed24ede54cb0e3b017511f99559.tar.gz
Merge branch 'fix-find_dependency-macro' into releasev3.0.0-rc1
-rw-r--r--Modules/CMakeFindDependencyMacro.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/CMakeFindDependencyMacro.cmake b/Modules/CMakeFindDependencyMacro.cmake
index 08c4990c2a..9334ba36cd 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}
@@ -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)