Parse Poco version and make available in header file #242
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| if ("${POCO_VERSION_MINOR}" STREQUAL "") | ||
| set( POCO_VERSION_MINOR "0") | ||
| endif() | ||
|
|
||
| string( SUBSTRING ${POCO_VERSION} 4 2 POCO_VERSION_PATCH ) | ||
| string( REGEX REPLACE "^0" "" POCO_VERSION_PATCH ${POCO_VERSION_PATCH} ) |
There was a problem hiding this comment.
Maybe change this to string( REGEX REPLACE "^0\(.\)" "\\1" POCO_VERSION_PATCH ${POCO_VERSION_PATCH} ) instead of the additional if.
There was a problem hiding this comment.
Thank you! I just updated the branch to include this line in place of the if statements.
|
I'm happy to merge this, but it is currently showing as a new file in git. There must be some way around that. Please add the appropriate line to |
|
PocoVersion.h has been added to .gitignore |
peterfpeterson
added a commit
that referenced
this pull request
Feb 23, 2015
…sion Parse Poco version and make available in header file
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes ticket #11117
The Poco version is defined as a hex value that cannot be directly used in preprocessor directives. Instead of parsing this value at run time, we use cmake to configure a header file that defines the major, minor and patch versions. In addition, we fix FindPoco.cmake so that version "00" returns "0" instead of an empty string.
Testing: Verify that the file Code/Mantid/Framework/Kernel/inc/MantidKernel/PocoVersion.h was created and that the versions match the version of Poco used to build Mantid.