diff options
| author | Brad King <brad.king@kitware.com> | 2014-02-24 15:40:06 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-02-24 15:40:06 (GMT) |
| commit | 461eaee53ecc1bd8c4239ff2e25fd85f0a5fc126 (patch) | |
| tree | 9d04b5dde77340fa3815b9003af73fedd7e183ca | |
| parent | cf42f93d07c91e7383d4c8bd19988aa0766ec45a (diff) | |
| parent | 5878c5d919a206b9a54f48f386ab98b5cff09e08 (diff) | |
| download | CMake-461eaee53ecc1bd8c4239ff2e25fd85f0a5fc126.zip CMake-461eaee53ecc1bd8c4239ff2e25fd85f0a5fc126.tar.gz CMake-461eaee53ecc1bd8c4239ff2e25fd85f0a5fc126.tar.bz2 | |
Merge topic 'fix-find_dependency-macro'
5878c5d9 Always set version variable of find_dependency macro
| -rw-r--r-- | Modules/CMakeFindDependencyMacro.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Modules/CMakeFindDependencyMacro.cmake b/Modules/CMakeFindDependencyMacro.cmake index 0f1f56d..c0a0ef7 100644 --- a/Modules/CMakeFindDependencyMacro.cmake +++ b/Modules/CMakeFindDependencyMacro.cmake @@ -29,9 +29,7 @@ macro(find_dependency dep) if (NOT ${dep}_FOUND) - if (${ARGV1}) - set(version ${ARGV1}) - endif() + set(version ${ARGV1}) set(exact_arg) if(${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION_EXACT) set(exact_arg EXACT) |