diff options
| author | Feng Xiao <xiaofeng@google.com> | 2016-07-12 16:36:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-12 16:36:41 -0700 |
| commit | 8eb90e380c702e1fcf0e68d1d32918da826e25f4 (patch) | |
| tree | 63a8da79538d16ecc0783c14f5f9725b1cb56307 | |
| parent | 70c1ac756d3cd8fa04725f82f0ad1a30404c3bb3 (diff) | |
| parent | 5520447a7861a77f61a47482649e4c113cc7df4a (diff) | |
| download | protobuf-8eb90e380c702e1fcf0e68d1d32918da826e25f4.tar.gz protobuf-8eb90e380c702e1fcf0e68d1d32918da826e25f4.tar.bz2 protobuf-8eb90e380c702e1fcf0e68d1d32918da826e25f4.zip | |
Merge pull request #1778 from yeswalrus/fix-prerelease-version
Fix a <package>_FIND_VERSION_PRERELEASE being ignored
| -rw-r--r-- | cmake/protobuf-config-version.cmake.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/protobuf-config-version.cmake.in b/cmake/protobuf-config-version.cmake.in index 3b8ced2d..0036c9ef 100644 --- a/cmake/protobuf-config-version.cmake.in +++ b/cmake/protobuf-config-version.cmake.in @@ -3,7 +3,7 @@ set(${PACKAGE_FIND_NAME}_VERSION_PRERELEASE "@protobuf_VERSION_PRERELEASE@" PARE # Prerelease versions cannot be passed in directly via the find_package command, # so we allow users to specify it in a variable -if(NOT DEFINED "${${PACKAGE_FIND_NAME}_FIND_VERSION_PRERELEASE}") +if(NOT DEFINED "${PACKAGE_FIND_NAME}_FIND_VERSION_PRERELEASE") set("${${PACKAGE_FIND_NAME}_FIND_VERSION_PRERELEASE}" "") else() set(PACKAGE_FIND_VERSION ${PACKAGE_FIND_VERSION}-${${PACKAGE_FIND_NAME}_FIND_VERSION_PRERELEASE}) |