sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-23 00:02:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Backport release-3_22] Cleanup proj version detection (#46137)

Browse Source 
* Remove define from find logic

* define proj version

* Update qgsconfig.h.in

* Update qgscoordinatereferencesystem.h

* Remove unneeded include

Co-authored-by: Matthias Kuhn <matthias@opengis.ch>
Co-authored-by: Mathieu Pellerin <nirvn.asia@gmail.com>
This commit is contained in:
qgis-bot 2021-11-20 12:37:39 +01:00 committed by GitHub
parent 663dcf8fb9
commit 58b0234b06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/FindProj.cmake
View File

@ -86,7 +86,6 @@ IF (PROJ_FOUND)
ENDIF (NOT PROJ_FIND_QUIETLY)
INCLUDE_DIRECTORIES(BEFORE SYSTEM ${PROJ_INCLUDE_DIR})
ADD_DEFINITIONS(-DPROJ_VERSION_MAJOR=${PROJ_VERSION_MAJOR})
ELSE (PROJ_FOUND)

4
cmake_templates/qgsconfig.h.in
View File

@ -51,6 +51,10 @@
#define PYTHON_VERSION_MINOR "${Python_VERSION_MINOR}"
#define PYTHON_VERSION_PATCH "${Python_VERSION_PATCH}"
#define PROJ_VERSION_MAJOR ${PROJ_VERSION_MAJOR}
#define PROJ_VERSION_MINOR ${PROJ_VERSION_MINOR}
#define PROJ_VERSION_PATCH ${PROJ_VERSION_PATCH}
#cmakedefine USING_NMAKE
#cmakedefine USING_NINJA

1
src/core/proj/qgscoordinatereferencesystem.h
View File

@ -32,6 +32,7 @@
//qgis includes
#include "qgis_sip.h"
#include "qgsconfig.h"
#include "qgsunittypes.h"
#include "qgsrectangle.h"
#include "qgssqliteutils.h"