[QGIS Commit] r8739 - in trunk/qgis: . cmake_templates src/app
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Tue Jul 8 16:41:42 EDT 2008
Author: timlinux
Date: 2008-07-08 16:41:42 -0400 (Tue, 08 Jul 2008)
New Revision: 8739
Modified:
trunk/qgis/CMakeLists.txt
trunk/qgis/cmake_templates/qgsconfig.h.in
trunk/qgis/src/app/qgisapp.cpp
Log:
Fix for ticket #1047
Modified: trunk/qgis/CMakeLists.txt
===================================================================
--- trunk/qgis/CMakeLists.txt 2008-07-08 14:10:32 UTC (rev 8738)
+++ trunk/qgis/CMakeLists.txt 2008-07-08 20:41:42 UTC (rev 8739)
@@ -5,8 +5,8 @@
SET(RELEASE_NAME "Metis")
SET(PROJECT_VERSION ${COMPLETE_VERSION})
PROJECT(qgis${PROJECT_VERSION})
+SET(QGIS_VERSION_INT 1100)
-
# TODO:
# - install includes for libs
# - nice output when configured
@@ -26,6 +26,12 @@
# set path to additional CMake modules
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+# in generated makefiles use relative paths so the project dir is moveable
+# Note commented out since it cause problems but it would be nice to resolve these and enable
+#
+# issue is caused by INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}) near the end of this file generating incorrect path
+#SET (CMAKE_USE_RELATIVE_PATHS ON)
+
# it's possible to set PLUGINS_ALSO_BINARIES to TRUE
# then some plugins that can run as standalone apps will be built
# also as standalone apps
Modified: trunk/qgis/cmake_templates/qgsconfig.h.in
===================================================================
--- trunk/qgis/cmake_templates/qgsconfig.h.in 2008-07-08 14:10:32 UTC (rev 8738)
+++ trunk/qgis/cmake_templates/qgsconfig.h.in 2008-07-08 20:41:42 UTC (rev 8739)
@@ -11,7 +11,12 @@
#define VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${RELEASE_NAME}"
//used in vim src/core/qgis.cpp
-#define VERSION_INT ${CPACK_PACKAGE_VERSION_MAJOR}${CPACK_PACKAGE_VERSION_MINOR}${CPACK_PACKAGE_VERSION_PATCH}
+//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}"
Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp 2008-07-08 14:10:32 UTC (rev 8738)
+++ trunk/qgis/src/app/qgisapp.cpp 2008-07-08 20:41:42 UTC (rev 8739)
@@ -4276,7 +4276,9 @@
{
versionInfo += parts[1] + "\n\n" + tr("Would you like more information?");
;
- QMessageBox::StandardButton result = QMessageBox::information(this, tr("QGIS Version Information"), versionInfo, QMessageBox::Ok | QMessageBox::Cancel);
+ QMessageBox::StandardButton result = QMessageBox::information(this,
+ tr("QGIS Version Information"), versionInfo, QMessageBox::Ok |
+ QMessageBox::Cancel);
if (result == QMessageBox::Ok)
{
// show more info
More information about the QGIS-commit
mailing list