kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-find_dependency-macro'

Browse Source 
3d8f7102 find_dependency: unset cmake_fd_version variable at end of macro
85d0f8de find_dependency: use correct version variable name
This commit is contained in:
Brad King 2014-02-26 10:31:45 -05:00 committed by CMake Topic Stage
commit 6391b32a32
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/CMakeFindDependencyMacro.cmake
View File

@ -50,7 +50,7 @@ macro(find_dependency dep)
_CMAKE_${dep}_TRANSITIVE_DEPENDENCY _CMAKE_${dep}_TRANSITIVE_DEPENDENCY
) )
find_package(${dep} ${version} find_package(${dep} ${cmake_fd_version}
${cmake_fd_exact_arg} ${cmake_fd_exact_arg}
${cmake_fd_quiet_arg} ${cmake_fd_quiet_arg}
${cmake_fd_required_arg} ${cmake_fd_required_arg}
@ -65,6 +65,7 @@ macro(find_dependency dep)
set(${CMAKE_FIND_PACKAGE_NAME}_FOUND False) set(${CMAKE_FIND_PACKAGE_NAME}_FOUND False)
return() return()
endif() endif()
set(cmake_fd_version)
set(cmake_fd_required_arg) set(cmake_fd_required_arg)
set(cmake_fd_quiet_arg) set(cmake_fd_quiet_arg)
set(cmake_fd_exact_arg) set(cmake_fd_exact_arg)