Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
fix #2822
git-svn-id: http://svn.osgeo.org/qgis/trunk@13792 c8812cc2-4d05-0410-92ff-de0c093fc19c
- Loading branch information
jef
committed
Jun 23, 2010
1 parent
c8247ae
commit 0843999
Showing
11 changed files
with
55 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters