Skip to content
Permalink
Browse files

fix build (followup 7674e16)

  • Loading branch information
jef-n committed Apr 2, 2019
1 parent 7e23f4d commit 2a6629ef56946e3ee54f81571350c7a6b94e6339
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/core/processing/qgsprocessingfeedback.cpp
@@ -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

4 comments on commit 2a6629e

@nirvn

This comment has been minimized.

Copy link
Contributor

nirvn replied Apr 2, 2019

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

@jef-n

This comment has been minimized.

Copy link
Member Author

jef-n replied Apr 2, 2019

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

This comment has been minimized.

Copy link
Member

pblottiere replied Apr 2, 2019

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

This comment has been minimized.

Copy link
Member

pblottiere replied Apr 2, 2019

@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.
You can’t perform that action at this time.