| qgsconfig.h | qgsconfig.h | |||
|---|---|---|---|---|
| // QGSCONFIG.H | // QGSCONFIG.H | |||
| #ifndef QGSCONFIG_H | #ifndef QGSCONFIG_H | |||
| #define QGSCONFIG_H | #define QGSCONFIG_H | |||
| // Version must be specified according to | // Version must be specified according to | |||
| // <int>.<int>.<int>-<any text>. | // <int>.<int>.<int>-<any text>. | |||
| // or else upgrading old project file will not work | // or else upgrading old project file will not work | |||
| // reliably. | // reliably. | |||
| #define VERSION "2.0.0-Dufour" | #define VERSION "2.0.1-Dufour" | |||
| //used in vim src/core/qgis.cpp | //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 | //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 inco rrect version status. | //because debuggin it out shows the decimal number 72 which results in inco rrect version status. | |||
| //As a short term fix I (Tim) am defining the version in top level cmake. I t would be good to | //As a short term fix I (Tim) am defining the version in top level cmake. I t would be good to | |||
| //reinstate this more generic approach below at some point though | //reinstate this more generic approach below at some point though | |||
| //#define VERSION_INT 200 | //#define VERSION_INT 201 | |||
| #define VERSION_INT 20000 | #define VERSION_INT 20001 | |||
| #define ABISYM(x) x ## 20000 | #define ABISYM(x) x ## 20001 | |||
| //used in main.cpp and anywhere else where the release name is needed | //used in main.cpp and anywhere else where the release name is needed | |||
| #define RELEASE_NAME "Dufour" | #define RELEASE_NAME "Dufour" | |||
| #define QGIS_PLUGIN_SUBDIR "lib/qgis/plugins" | #define QGIS_PLUGIN_SUBDIR "lib/qgis/plugins" | |||
| #define QGIS_DATA_SUBDIR "share/qgis" | #define QGIS_DATA_SUBDIR "share/qgis" | |||
| #define QGIS_LIBEXEC_SUBDIR "lib/qgis" | #define QGIS_LIBEXEC_SUBDIR "lib/qgis" | |||
| #define QGIS_LIB_SUBDIR "lib" | #define QGIS_LIB_SUBDIR "lib" | |||
| #define CMAKE_INSTALL_PREFIX "/home/ut/testing/qgis/2.0.0" | #define CMAKE_INSTALL_PREFIX "/home/ut/testing/qgis/2.0.1" | |||
| #define CMAKE_SOURCE_DIR "/home/ut/repository/qgis/install/qgis-2.0.0" | #define CMAKE_SOURCE_DIR "/home/ut/repository/qgis/install/qgis-2.0.1" | |||
| #define QSCINTILLA_VERSION_STR "2.5.1" | #define QSCINTILLA_VERSION_STR "" | |||
| //used by Mac to find system Qt plugins when bundle is run from build direc tory | //used by Mac to find system Qt plugins when bundle is run from build direc tory | |||
| #define QTPLUGINSDIR "/usr/plugins" | #define QTPLUGINSDIR "/usr/plugins" | |||
| /* #undef USING_NMAKE */ | /* #undef USING_NMAKE */ | |||
| #define HAVE_POSTGRESQL | #define HAVE_POSTGRESQL | |||
| #define HAVE_SPATIALITE | #define HAVE_SPATIALITE | |||
| #define HAVE_MSSQL | #define HAVE_MSSQL | |||
| End of changes. 4 change blocks. | ||||
| 7 lines changed or deleted | 7 lines changed or added | |||