diff --git a/cmake/FindProj.cmake b/cmake/FindProj.cmake index fde071df452..ce9a7f35acf 100644 --- a/cmake/FindProj.cmake +++ b/cmake/FindProj.cmake @@ -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) diff --git a/cmake_templates/qgsconfig.h.in b/cmake_templates/qgsconfig.h.in index 479134c2887..c326bd9268c 100644 --- a/cmake_templates/qgsconfig.h.in +++ b/cmake_templates/qgsconfig.h.in @@ -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 diff --git a/src/core/proj/qgscoordinatereferencesystem.h b/src/core/proj/qgscoordinatereferencesystem.h index 0abebbb1559..3349fb21fa9 100644 --- a/src/core/proj/qgscoordinatereferencesystem.h +++ b/src/core/proj/qgscoordinatereferencesystem.h @@ -32,6 +32,7 @@ //qgis includes #include "qgis_sip.h" +#include "qgsconfig.h" #include "qgsunittypes.h" #include "qgsrectangle.h" #include "qgssqliteutils.h"