Skip to content

Commit c2e6c35

Browse files
author
jef
committedFeb 8, 2009
merge fixes from trunk:
r10117: fix #1532 r10116: skip labels with size<=0 - otherwise the size is ignored d r10094: fix #1523 r10084: fix #1516 r10078: add -Wformat-security to PEDANTIC r10073: update desktop integration in debian package r10068: fix comparision r9943: fix postgres <8.3 support r9916: speed up QgsRubberBand::setToGeometry() r9914: update trac link in about box r9908: apply patch #1447 from smizuno (thanks!) r9894+9895: update debian packaging r9880: update german translation git-svn-id: http://svn.osgeo.org/qgis/branches/Version-1_0@10136 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 126bb08 commit c2e6c35

Some content is hidden

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

41 files changed

+202
-138
lines changed
 

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ IF (PEDANTIC)
179179
ADD_DEFINITIONS( /wd4512 ) # assignment operator could not be generated (sqlite3_index_info)
180180
ADD_DEFINITIONS( /wd4610 ) # user defined constructor required (sqlite3_index_info)
181181
ELSE (MSVC)
182-
ADD_DEFINITIONS( -Wall -Wno-long-long )
182+
ADD_DEFINITIONS( -Wall -Wno-long-long -Wformat-security )
183183
# Qt produces lots of warnings with strict aliasing (as of Qt 4.4.0 & GCC 4.3)
184184
# ADD_DEFINITIONS( -fstrict-aliasing -Wstrict-aliasing=1 )
185185
ENDIF (MSVC)

‎cmake/FindPostgres.cmake

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,13 @@ ENDIF(WIN32)
6161

6262
IF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
6363
SET(POSTGRES_FOUND TRUE)
64+
65+
IF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
66+
SET(HAVE_PGCONFIG TRUE)
67+
ELSE(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
68+
SET(HAVE_PGCONFIG FALSE)
69+
ENDIF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
70+
6471
ENDIF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
6572

6673

@@ -80,5 +87,5 @@ ELSE (POSTGRES_FOUND)
8087
ELSE (POSTGRES_FIND_REQUIRED)
8188
MESSAGE(STATUS "Could not find PostgreSQL")
8289
ENDIF (POSTGRES_FIND_REQUIRED)
83-
90+
8491
ENDIF (POSTGRES_FOUND)

0 commit comments

Comments
 (0)
Please sign in to comment.