Skip to content

Commit 5c0bcd9

Browse files
AilurupodaAilurupoda
authoredJan 10, 2019
Merge branch 'master' into sirs_db_manager
2 parents 238ea72 + fd00cd5 commit 5c0bcd9

File tree

505 files changed

+13927
-3738
lines changed

Some content is hidden

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

505 files changed

+13927
-3738
lines changed
 

‎CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,13 +480,15 @@ IF (PEDANTIC)
480480
ENDIF (NOT USING_NMAKE AND NOT USING_NINJA)
481481

482482
# disable warnings
483+
SET(_warnings "${_warnings} /wd4091 ") # 'typedef': ignored on left of '' when no variable is declared (occurs in MS DbgHelp.h header)
483484
SET(_warnings "${_warnings} /wd4100 ") # unused formal parameters
484485
SET(_warnings "${_warnings} /wd4127 ") # constant conditional expressions (used in Qt template classes)
485486
SET(_warnings "${_warnings} /wd4190 ") # 'identifier' has C-linkage specified, but returns UDT 'identifier2' which is incompatible with C
486487
SET(_warnings "${_warnings} /wd4231 ") # nonstandard extension used : 'identifier' before template explicit instantiation (used in Qt template classes)
487488
SET(_warnings "${_warnings} /wd4244 ") # conversion from '...' to '...' possible loss of data
488489
SET(_warnings "${_warnings} /wd4251 ") # needs to have dll-interface to be used by clients of class (occurs in Qt template classes)
489490
SET(_warnings "${_warnings} /wd4275 ") # non dll-interface class '...' used as base for dll-interface class '...'
491+
SET(_warnings "${_warnings} /wd4290 ") # c++ exception specification ignored except to indicate a function is not __declspec(nothrow) (occurs in sip generated bindings)
490492
SET(_warnings "${_warnings} /wd4456 ") # declaration of '...' hides previous local declaration
491493
SET(_warnings "${_warnings} /wd4457 ") # declaration of '...' hides a function parameter
492494
SET(_warnings "${_warnings} /wd4458 ") # declaration of '...' hides class member

‎cmake/FindGRASS.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ IF (UNIX)
167167
ENDFOREACH(VERSION_MINOR)
168168
ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
169169
FOREACH (PATH /usr/lib64 /usr/lib)
170-
FOREACH (VERSION grass70, grass72, grass74)
170+
FOREACH (VERSION grass76, grass74, grass72, grass70)
171171
LIST(APPEND GRASS_PATHS "${PATH}/${VERSION}")
172172
ENDFOREACH (VERSION)
173173
ENDFOREACH (PATH)
@@ -178,10 +178,10 @@ ENDIF (UNIX)
178178
IF (APPLE)
179179
IF (GRASS_FIND_VERSION EQUAL 7)
180180
LIST(APPEND GRASS_PATHS
181-
/Applications/GRASS-7.0.app/Contents/MacOS
182-
/Applications/GRASS-7.1.app/Contents/MacOS
183-
/Applications/GRASS-7.2.app/Contents/MacOS
181+
/Applications/GRASS-7.6.app/Contents/MacOS
184182
/Applications/GRASS-7.4.app/Contents/MacOS
183+
/Applications/GRASS-7.2.app/Contents/MacOS
184+
/Applications/GRASS-7.0.app/Contents/MacOS
185185
)
186186
ENDIF ()
187187
LIST(APPEND GRASS_PATHS /Applications/GRASS.app/Contents/Resources)

0 commit comments

Comments
 (0)