diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-02-24 18:27:35 +0100 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-02-24 19:00:31 +0100 |
| commit | a35ce7235b94ce040b605d87ee326e8d354a5ecb (patch) | |
| tree | 9f2d742554b4d5e613b191a67eea7c0a612d96e6 /Modules/CMakeFindDependencyMacro.cmake | |
| parent | 5878c5d919a206b9a54f48f386ab98b5cff09e08 (diff) | |
| download | cmake-a35ce7235b94ce040b605d87ee326e8d354a5ecb.tar.gz | |
find_dependency: Add namespacing for variables in the macro.
Avoid setting a variable called 'version' etc.
Diffstat (limited to 'Modules/CMakeFindDependencyMacro.cmake')
| -rw-r--r-- | Modules/CMakeFindDependencyMacro.cmake | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/Modules/CMakeFindDependencyMacro.cmake b/Modules/CMakeFindDependencyMacro.cmake index c0a0ef780e..142130dcf5 100644 --- a/Modules/CMakeFindDependencyMacro.cmake +++ b/Modules/CMakeFindDependencyMacro.cmake @@ -29,27 +29,31 @@ macro(find_dependency dep) if (NOT ${dep}_FOUND) - set(version ${ARGV1}) - set(exact_arg) + set(cmake_fd_version ${ARGV1}) + set(cmake_fd_exact_arg) if(${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION_EXACT) - set(exact_arg EXACT) + set(cmake_fd_exact_arg EXACT) endif() - set(quiet_arg) + set(cmake_fd_quiet_arg) if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY) - set(quiet_arg QUIET) + set(cmake_fd_quiet_arg QUIET) endif() - set(required_arg) + set(cmake_fd_required_arg) if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED) - set(required_arg REQUIRED) + set(cmake_fd_required_arg REQUIRED) endif() - get_property(alreadyTransitive GLOBAL PROPERTY + get_property(cmake_fd_alreadyTransitive GLOBAL PROPERTY _CMAKE_${dep}_TRANSITIVE_DEPENDENCY ) - find_package(${dep} ${version} ${exact_arg} ${quiet_arg} ${required_arg}) + find_package(${dep} ${version} + ${cmake_fd_exact_arg} + ${cmake_fd_quiet_arg} + ${cmake_fd_required_arg} + ) - if(NOT DEFINED alreadyTransitive OR alreadyTransitive) + if(NOT DEFINED cmake_fd_alreadyTransitive OR cmake_fd_alreadyTransitive) set_property(GLOBAL PROPERTY _CMAKE_${dep}_TRANSITIVE_DEPENDENCY TRUE) endif() @@ -58,8 +62,8 @@ macro(find_dependency dep) set(${CMAKE_FIND_PACKAGE_NAME}_FOUND False) return() endif() - set(required_arg) - set(quiet_arg) - set(exact_arg) + set(cmake_fd_required_arg) + set(cmake_fd_quiet_arg) + set(cmake_fd_exact_arg) endif() endmacro() |