Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
fix #2822
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13792 c8812cc2-4d05-0410-92ff-de0c093fc19c
- Loading branch information
Showing
with
55 additions
and 43 deletions.
- +6 −2 CMakeLists.txt
- +34 −33 cmake_templates/qgsconfig.h.in
- +1 −1 src/app/qgisapp.cpp
- +2 −0 src/core/raster/qgsrasterlayer.cpp
- +1 −1 src/plugins/grass/CMakeLists.txt
- +2 −1 src/plugins/grass/qgsgrassmodule.cpp
- +2 −1 src/plugins/grass/qgsgrassshell.cpp
- +2 −1 src/plugins/grass/qgsgrasstools.cpp
- +1 −1 src/providers/grass/CMakeLists.txt
- +2 −1 src/providers/grass/qgsgrass.cpp
- +2 −1 src/providers/grass/qgsgrassrasterprovider.cpp
| @@ -1,33 +1,34 @@ | ||
|
|
||
| // QGSCONFIG.H | ||
|
|
||
| #ifndef QGSCONFIG_H | ||
| #define QGSCONFIG_H | ||
|
|
||
| // Version must be specified according to | ||
| // <int>.<int>.<int>-<any text>. | ||
| // or else upgrading old project file will not work | ||
| // reliably. | ||
| #define VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${RELEASE_NAME}" | ||
|
|
||
| //used in vim src/core/qgis.cpp | ||
| //The way below should work but it resolves to a number like 0110 which the compiler treats as octal I think | ||
| //because debuggin it out shows the decimal number 72 which results in incorrect version status. | ||
| //As a short term fix I (Tim) am defining the version in top level cmake. It would be good to | ||
| //reinstate this more generic approach below at some point though | ||
| //#define VERSION_INT ${CPACK_PACKAGE_VERSION_MAJOR}${CPACK_PACKAGE_VERSION_MINOR}${CPACK_PACKAGE_VERSION_PATCH} | ||
| #define VERSION_INT ${QGIS_VERSION_INT} | ||
| //used in main.cpp and anywhere else where the release name is needed | ||
| #define RELEASE_NAME "${RELEASE_NAME}" | ||
|
|
||
| #define QGIS_PLUGIN_SUBDIR "${QGIS_PLUGIN_SUBDIR}" | ||
| #define QGIS_DATA_SUBDIR "${QGIS_DATA_SUBDIR}" | ||
|
|
||
| #cmakedefine HAVE_POSTGRESQL | ||
|
|
||
| #cmakedefine HAVE_SPATIALITE | ||
|
|
||
| #cmakedefine HAVE_PYTHON | ||
|
|
||
| #endif | ||
|
|
||
|
|
||
| // QGSCONFIG.H | ||
|
|
||
| #ifndef QGSCONFIG_H | ||
| #define QGSCONFIG_H | ||
|
|
||
| // Version must be specified according to | ||
| // <int>.<int>.<int>-<any text>. | ||
| // or else upgrading old project file will not work | ||
| // reliably. | ||
| #define VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${RELEASE_NAME}" | ||
|
|
||
| //used in vim src/core/qgis.cpp | ||
| //The way below should work but it resolves to a number like 0110 which the compiler treats as octal I think | ||
| //because debuggin it out shows the decimal number 72 which results in incorrect version status. | ||
| //As a short term fix I (Tim) am defining the version in top level cmake. It would be good to | ||
| //reinstate this more generic approach below at some point though | ||
| //#define VERSION_INT ${CPACK_PACKAGE_VERSION_MAJOR}${CPACK_PACKAGE_VERSION_MINOR}${CPACK_PACKAGE_VERSION_PATCH} | ||
| #define VERSION_INT ${QGIS_VERSION_INT} | ||
| //used in main.cpp and anywhere else where the release name is needed | ||
| #define RELEASE_NAME "${RELEASE_NAME}" | ||
|
|
||
| #define QGIS_PLUGIN_SUBDIR "${QGIS_PLUGIN_SUBDIR}" | ||
| #define QGIS_DATA_SUBDIR "${QGIS_DATA_SUBDIR}" | ||
| #define QGIS_LIBEXEC_SUBDIR "${QGIS_LIBEXEC_SUBDIR}" | ||
|
|
||
| #cmakedefine HAVE_POSTGRESQL | ||
|
|
||
| #cmakedefine HAVE_SPATIALITE | ||
|
|
||
| #cmakedefine HAVE_PYTHON | ||
|
|
||
| #endif | ||
|
|