Skip to content
Permalink
Browse files
Cleanup proj version detection (#46134)
Make sure the proj version detection logic is made available to reverse dependencies too.
In short, move it from an obscure define in a custom cmake find file to a generated header.

Co-authored-by: Mathieu Pellerin <nirvn.asia@gmail.com>
  • Loading branch information
m-kuhn and nirvn committed Nov 20, 2021
1 parent 3ef76e1 commit 1d1d59d7fb069b90f0498d98f7c74708b8f841e3
Showing with 5 additions and 1 deletion.
  1. +0 −1 cmake/FindProj.cmake
  2. +4 −0 cmake_templates/qgsconfig.h.in
  3. +1 −0 src/core/proj/qgscoordinatereferencesystem.h
@@ -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)

@@ -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
@@ -32,6 +32,7 @@

//qgis includes
#include "qgis_sip.h"
#include "qgsconfig.h"
#include "qgsunittypes.h"
#include "qgsrectangle.h"
#include "qgssqliteutils.h"

0 comments on commit 1d1d59d

Please sign in to comment.