Skip to content

Commit

Permalink
fix build (followup 7674e16)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jef-n
jef-n committed Apr 2, 2019
1 parent 7e23f4d commit 2a6629e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/core/processing/qgsprocessingfeedback.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void QgsProcessingFeedback::pushVersionInfo()

#if PROJ_VERSION_MAJOR > 4
PJ_INFO info = proj_info();
pushDebugInfo( tr( "PROJ version: %1.%2.%3" ).arg( PROJ_VERSION_MAJOR ).arg( PROJ_VERSION_MINOR ).arg( PROJ_VERSION_PATCH );
pushDebugInfo( tr( "PROJ version: %1.%2.%3" ).arg( PROJ_VERSION_MAJOR ).arg( PROJ_VERSION_MINOR ).arg( PROJ_VERSION_PATCH ) );
#else
pushDebugInfo( tr( "PROJ version: %1" ).arg( PJ_VERSION ) );
#endif
Expand Down

4 comments on commit 2a6629e

@nirvn
Copy link
Contributor

@nirvn nirvn commented on 2a6629e Apr 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jef-n , there's also a unused variable build warning for PJ_INFO info = proj_info();.

@jef-n
Copy link
Member Author

@jef-n jef-n commented on 2a6629e Apr 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should probably be tr( "PROJ version: %1" ).arg( info.release ) instead of tr( "PROJ version: %1.%2.%3" ).arg( PROJ_VERSION_MAJOR ).arg( PROJ_VERSION_MINOR ).arg( PROJ_VERSION_PATCH ) like in tests/src/core/testqgscoordinatereferencesystem.cpp:127

@pblottiere
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Compilation is failing here:

../src/core/processing/qgsprocessingfeedback.cpp: In member function ‘void QgsProcessingFeedback::pushVersionInfo()’:
../src/core/processing/qgsprocessingfeedback.cpp:70:126: error: expected ‘)’ before ‘;’ token
   pushDebugInfo( tr( "PROJ version: %1.%2.%3" ).arg( PROJ_VERSION_MAJOR ).arg( PROJ_VERSION_MINOR ).arg( PROJ_VERSION_PATCH );
                ~                                                                                                             ^
                                                                                                                              )
[316/5017] Building CXX object src/core/CMakeFiles/qgis_core.dir/expression/qgsexpressionfunction.cpp.o

should probably be tr( "PROJ version: %1" ).arg( info.release ) instead of tr( "PROJ version: %1.%2.%3" ).arg( PROJ_VERSION_MAJOR ).arg( PROJ_VERSION_MINOR ).arg( PROJ_VERSION_PATCH )

You're right @jef-n, the compilation is fixed this way. I'm doing a PR for that.

Thanks!

@pblottiere
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jef-n Argh, I didn't see that your last commit fixed the build, sorry for the noise... But I'll propose a PR with tr( "PROJ version: %1" ).arg( info.release ) to avoid the warning about info.

Please sign in to comment.