Skip to content

Commit 6af929a

Browse files
author
Hugo Mercier
committedJul 25, 2012
Merge branch 'master' of git://github.com/qgis/Quantum-GIS
Conflicts: src/core/symbology-ng/qgsrulebasedrendererv2.cpp
·
ltr-3_40Before-merge-new_vector_api
2 parents f2c4f53 + d039c3f commit 6af929a

File tree

602 files changed

+123223
-82069
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

602 files changed

+123223
-82069
lines changed
 

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ qtcreator-build/
2525
ms-windows/nsis/
2626
ms-windows/osgeo4w/addons/
2727
ms-windows/packages/
28+
ms-windows/osgeo4w/binary-*
2829
ms-windows/progs/
2930
ms-windows/untgz/
3031
scripts/astyle.exe

‎CMakeLists.txt

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
SET(CPACK_PACKAGE_VERSION_MAJOR "1")
2-
SET(CPACK_PACKAGE_VERSION_MINOR "8")
2+
SET(CPACK_PACKAGE_VERSION_MINOR "9")
33
SET(CPACK_PACKAGE_VERSION_PATCH "0")
44
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
5-
SET(RELEASE_NAME "Lisboa")
5+
SET(RELEASE_NAME "Master")
66
SET(PROJECT_VERSION ${COMPLETE_VERSION})
77
PROJECT(qgis${PROJECT_VERSION})
88
IF (APPLE)
@@ -89,25 +89,6 @@ IF (WITH_QTMOBILITY)
8989
FIND_PACKAGE(QtMobility 1.1.0)
9090
ENDIF (WITH_QTMOBILITY)
9191

92-
IF (ANDROID)
93-
SET (DEFAULT_WITH_TOUCH TRUE)
94-
ELSE (ANDROID)
95-
SET (DEFAULT_WITH_TOUCH FALSE)
96-
ENDIF (ANDROID)
97-
#Add a touch mode if Qt has Qt Gestures (starting from 4.6)
98-
IF ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 )
99-
SET (WITH_TOUCH ${DEFAULT_WITH_TOUCH} CACHE BOOL "Determines if touch interface related code should be build")
100-
ELSE ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 )
101-
SET (WITH_TOUCH FALSE)
102-
ENDIF ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 )
103-
IF (WITH_TOUCH)
104-
ADD_DEFINITIONS(-DHAVE_TOUCH)
105-
MESSAGE (STATUS "Touch support enabled")
106-
ELSE (WITH_TOUCH)
107-
MESSAGE (STATUS "Touch support disabled")
108-
ENDIF (WITH_TOUCH)
109-
110-
11192
SET (WITH_GLOBE FALSE CACHE BOOL "Determines whether Globe plugin should be built")
11293
IF (WITH_GLOBE)
11394
SET(QT_USE_QTOPENGL 1)
@@ -228,6 +209,25 @@ IF(WITH_DESKTOP)
228209
ENDIF(NOT QT_QTWEBKIT_FOUND)
229210
ENDIF(WITH_DESKTOP)
230211

212+
IF (ANDROID)
213+
SET (DEFAULT_WITH_TOUCH TRUE)
214+
ELSE (ANDROID)
215+
SET (DEFAULT_WITH_TOUCH FALSE)
216+
ENDIF (ANDROID)
217+
#Add a touch mode if Qt has Qt Gestures (starting from 4.6)
218+
IF ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 )
219+
SET (WITH_TOUCH ${DEFAULT_WITH_TOUCH} CACHE BOOL "Determines if touch interface related code should be build")
220+
ELSE ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 )
221+
SET (WITH_TOUCH FALSE)
222+
ENDIF ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 )
223+
IF (WITH_TOUCH)
224+
# following variable is used in qgsconfig.h
225+
SET (HAVE_TOUCH TRUE)
226+
MESSAGE (STATUS "Touch support enabled")
227+
ELSE (WITH_TOUCH)
228+
MESSAGE (STATUS "Touch support disabled")
229+
ENDIF (WITH_TOUCH)
230+
231231
IF (ENABLE_TESTS)
232232
SET( QT_USE_QTTEST TRUE )
233233
ENABLE_TESTING()
@@ -370,7 +370,11 @@ ELSE (WIN32)
370370
SET (QGIS_PLUGIN_SUBDIR_REV ../../MacOS)
371371
SET (DEFAULT_INCLUDE_SUBDIR include/qgis)
372372
# path for framework references
373-
SET (CMAKE_INSTALL_NAME_DIR @executable_path/${QGIS_FW_SUBDIR})
373+
IF (ENABLE_TESTS)
374+
SET (CMAKE_INSTALL_NAME_DIR ${CMAKE_BINARY_DIR}/output/lib)
375+
ELSE (ENABLE_TESTS)
376+
SET (CMAKE_INSTALL_NAME_DIR @executable_path/${QGIS_FW_SUBDIR})
377+
ENDIF (ENABLE_TESTS)
374378
IF (WITH_GLOBE)
375379
SET (OSG_PLUGINS_PATH "" CACHE PATH "Path to OSG plugins for bundling")
376380
ENDIF (WITH_GLOBE)
@@ -457,6 +461,13 @@ SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/${QGIS_LIB_SUBDIR})
457461
# if run from the build directory QGIS will detect it and alter the paths
458462
FILE(WRITE ${QGIS_OUTPUT_DIRECTORY}/${QGIS_BIN_SUBDIR}/source_path.txt "${CMAKE_SOURCE_DIR}")
459463

464+
# symlink provider plugins dir for Mac unit tests
465+
IF (APPLE AND ENABLE_TESTS)
466+
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
467+
"${CMAKE_CURRENT_BINARY_DIR}/Plugins"
468+
"${CMAKE_CURRENT_BINARY_DIR}/output/Plugins")
469+
ENDIF (APPLE AND ENABLE_TESTS)
470+
460471
# manual page - makes sense only on unix systems
461472
IF (UNIX AND NOT APPLE)
462473
SET (DEFAULT_MANUAL_SUBDIR man)

0 commit comments

Comments
 (0)
Please sign in to comment.