Merge branch 'master' into rulebaseDialog

CMakeLists.txt

@@ -616,11 +616,11 @@ IF (WITH_CORE)
     ENDIF(MSVC)
   ENDIF(COMMAND cmake_policy)
 
-  IF (PEDANTIC AND NOT WIN32 AND NOT APPLE)
+  if("${CMAKE_SYSTEM_NAME}"  MATCHES "Linux")
     SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
     SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined")
     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined")
-  ENDIF(PEDANTIC AND NOT WIN32 AND NOT APPLE)
+  endif() #"${CMAKE_SYSTEM_NAME}"  MATCHES "Linux")
 
   SET(CMAKE_CXX_VISIBILITY_PRESET hidden)
   INCLUDE(GenerateExportHeader)

cmake/FindGDAL.cmake

@@ -167,7 +167,7 @@ ELSE(WIN32)
             SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
           ENDIF (NOT GDAL_LIBRARY)
         ELSE (APPLE)
-          SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.so CACHE STRING INTERNAL)
+          FIND_LIBRARY(GDAL_LIBRARY NAMES ${GDAL_LIB_NAME} PATHS ${GDAL_LINK_DIRECTORIES}/lib)
         ENDIF (APPLE)
 
       ELSE(GDAL_CONFIG)

cmake/FindGEOS.cmake

@@ -148,7 +148,7 @@ ELSE(WIN32)
             SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
           ENDIF (NOT GEOS_LIBRARY)
         ELSE (APPLE)
-          SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.so CACHE STRING INTERNAL)
+          FIND_LIBRARY(GEOS_LIBRARY NAMES ${GEOS_LIB_NAME} PATHS ${GEOS_LIB_DIRECTORIES}/lib)
         ENDIF (APPLE)
         #MESSAGE("DBG  GEOS_LIBRARY=${GEOS_LIBRARY}")
 

cmake/FindGRASS.cmake

@@ -159,8 +159,20 @@ ENDIF (WIN32)
 
 IF (UNIX)
   IF (GRASS_FIND_VERSION EQUAL 7)
-    LIST(APPEND GRASS_PATHS /usr/lib64/grass70 /usr/lib/grass70 /usr/lib64/grass71 /usr/lib/grass71 /usr/lib64/grass72 /usr/lib/grass72)
-  ENDIF ()
+    IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+        FOREACH (VERSION_MINOR 0 1 2 3 4)
+            FOREACH (VERSION_BUILD 0 1 2 3 4 5)
+                LIST (APPEND GRASS_PATHS /usr/local/grass-${GRASS_FIND_VERSION}.${VERSION_MINOR}.${VERSION_BUILD})
+            ENDFOREACH (VERSION_BUILD)
+        ENDFOREACH(VERSION_MINOR)
+    ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+        FOREACH (PATH /usr/lib64 /usr/lib)
+            FOREACH (VERSION grass70, grass71, grass72)
+                LIST(APPEND GRASS_PATHS "${PATH}/${VERSION}")
+            ENDFOREACH (VERSION)
+        ENDFOREACH (PATH)
+    ENDIF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+   ENDIF (GRASS_FIND_VERSION EQUAL 7)
 ENDIF (UNIX)
 
 IF (APPLE)

cmake/FindPostgres.cmake

@@ -96,7 +96,7 @@ ELSE(WIN32)
         ENDFOREACH(_LIBNAME ${_LIBS})
 
       ELSE (CYGWIN)
-        SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.so CACHE STRING INTERNAL)
+        FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq libpq libpqdll PATHS ${PG_TMP}/lib)
       ENDIF (APPLE)
     ENDIF(POSTGRES_CONFIG)
 

cmake/FindPyQt5.py

@@ -37,9 +37,15 @@
     import PyQt5.QtCore
     import sipconfig # won't work for SIP v5
     import os.path
+    import sys
     cfg = sipconfig.Configuration()
     sip_dir = cfg.default_sip_dir
-    for p in (os.path.join(sip_dir, "PyQt5"), sip_dir):
+    if sys.platform.startswith('freebsd'):
+        py_version = str(sys.version_info.major) + str(sys.version_info.minor)
+        sip_dir = sip_dir.replace(py_version, '')
+    for p in (os.path.join(sip_dir, "PyQt5"),
+              os.path.join(sip_dir, "PyQt5-3"),
+              sip_dir):
         if os.path.exists(os.path.join(p, "QtCore", "QtCoremod.sip")):
             sip_dir = p
             break

cmake/FindQScintilla.cmake

@@ -39,6 +39,7 @@ ELSE(EXISTS QSCINTILLA_VERSION_STR)
     PATHS
       "${QT_LIBRARY_DIR}"
       /usr/local/lib
+      /usr/local/lib/qt5
       /usr/lib
   )
 

cmake/FindQwt.cmake

@@ -12,13 +12,14 @@
 #