Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1778 from yeswalrus/fix-prerelease-version

Browse Source 
Fix a <package>_FIND_VERSION_PRERELEASE being ignored
pull/1687/merge
Feng Xiao 9 years ago committed by GitHub
parent 70c1ac756d 5520447a78
commit 8eb90e380c
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      cmake/protobuf-config-version.cmake.in

2
cmake/protobuf-config-version.cmake.in
Unescape View File

@ -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, # Prerelease versions cannot be passed in directly via the find_package command,
# so we allow users to specify it in a variable # 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}" "") set("${${PACKAGE_FIND_NAME}_FIND_VERSION_PRERELEASE}" "")
else() else()
set(PACKAGE_FIND_VERSION ${PACKAGE_FIND_VERSION}-${${PACKAGE_FIND_NAME}_FIND_VERSION_PRERELEASE}) set(PACKAGE_FIND_VERSION ${PACKAGE_FIND_VERSION}-${${PACKAGE_FIND_NAME}_FIND_VERSION_PRERELEASE})

Write Preview
Loading…
Cancel
Save