Skip to content

Commit 2ada167

Browse files
Qgis-Tr-krQgis-Tr-kr
committedJun 13, 2014
Merge pull request #1 from qgis/master
Forked suouce update request
·
ltr-3_40archive/master_2
2 parents c31b673 + ea0e1b1 commit 2ada167

File tree

1,056 files changed

+349586
-423205
lines changed

Some content is hidden

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

1,056 files changed

+349586
-423205
lines changed
 

‎CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,15 @@ IF (PEDANTIC)
310310
# disable warnings
311311
ADD_DEFINITIONS( /wd4100 ) # unused formal parameters
312312
ADD_DEFINITIONS( /wd4127 ) # constant conditional expressions (used in Qt template classes)
313+
ADD_DEFINITIONS( /wd4231 ) # nonstandard extension used : 'identifier' before template explicit instantiation (used in Qt template classes)
314+
ADD_DEFINITIONS( /wd4251 ) # needs to have dll-interface to be used by clients of class (occurs in Qt template classes)
315+
ADD_DEFINITIONS( /wd4275 ) # non dll-interface class '...' used as base for dll-interface class '...'
313316
ADD_DEFINITIONS( /wd4505 ) # unreferenced local function has been removed (QgsRasterDataProvider::extent)
314317
ADD_DEFINITIONS( /wd4510 ) # default constructor could not be generated (sqlite3_index_info, QMap)
315318
ADD_DEFINITIONS( /wd4512 ) # assignment operator could not be generated (sqlite3_index_info)
316319
ADD_DEFINITIONS( /wd4610 ) # user defined constructor required (sqlite3_index_info)
317320
ADD_DEFINITIONS( /wd4706 ) # assignment within conditional expression (pal)
321+
ADD_DEFINITIONS( /wd4800 ) # 'int' : forcing value to bool 'true' or 'false' (performance warning)
318322
ELSE (MSVC)
319323
# add warnings via flags (not as definitions as on Mac -Wall can not be overridden per language )
320324
SET(_warnings "-Wall -Wextra -Wno-long-long -Wformat-security -Wno-strict-aliasing")

‎cmake/FindSPATIALITE.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ IF (SPATIALITE_FOUND)
6969
SET(CMAKE_REQUIRED_LIBRARIES "-F/Library/Frameworks" ${CMAKE_REQUIRED_LIBRARIES})
7070
ENDIF(APPLE)
7171
check_library_exists("${SPATIALITE_LIBRARY}" gaiaDropTable "" SPATIALITE_VERSION_GE_4_0_0)
72+
check_library_exists("${SPATIALITE_LIBRARY}" gaiaStatisticsInvalidate "" SPATIALITE_VERSION_G_4_1_1)
7273

7374
ELSE (SPATIALITE_FOUND)
7475

0 commit comments

Comments
 (0)