sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-04 00:04:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix pathes for FreeBSD

Browse Source
This commit is contained in:
Loïc Bartoletti 2018-01-14 21:29:54 +01:00 committed by Denis Rouzaud
parent e0c12d519f
commit 8d4d08f8a0
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/FindPyQt5.py
View File

@ -37,8 +37,12 @@ except ImportError:
import PyQt5.QtCore import PyQt5.QtCore
import sipconfig # won't work for SIP v5 import sipconfig # won't work for SIP v5
import os.path import os.path
import sys
cfg = sipconfig.Configuration() cfg = sipconfig.Configuration()
sip_dir = cfg.default_sip_dir sip_dir = cfg.default_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"), sip_dir): for p in (os.path.join(sip_dir, "PyQt5"), sip_dir):
if os.path.exists(os.path.join(p, "QtCore", "QtCoremod.sip")): if os.path.exists(os.path.join(p, "QtCore", "QtCoremod.sip")):
sip_dir = p sip_dir = p

1
cmake/FindQScintilla.cmake
View File

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

4
cmake/FindQwt.cmake
View File

@ -12,13 +12,14 @@
# #
set(QWT_LIBRARY_NAMES qwt-qt5 qwt6-qt5 qwt) set(QWT_LIBRARY_NAMES qwt-qt5 qwt6-qt5 qwt qwt6)
find_library(QWT_LIBRARY find_library(QWT_LIBRARY
NAMES ${QWT_LIBRARY_NAMES} NAMES ${QWT_LIBRARY_NAMES}
PATHS PATHS
/usr/lib /usr/lib
/usr/local/lib /usr/local/lib
/usr/local/lib/qt5
"$ENV{LIB_DIR}/lib" "$ENV{LIB_DIR}/lib"
"$ENV{LIB}" "$ENV{LIB}"
) )
@ -32,6 +33,7 @@ FIND_PATH(QWT_INCLUDE_DIR NAMES qwt.h PATHS
"${_qwt_fw}/Headers" "${_qwt_fw}/Headers"
/usr/include /usr/include
/usr/local/include /usr/local/include
/usr/local/include/qt5
"$ENV{LIB_DIR}/include" "$ENV{LIB_DIR}/include"
"$ENV{INCLUDE}" "$ENV{INCLUDE}"
PATH_SUFFIXES qwt-qt5 qwt qwt6 PATH_SUFFIXES qwt-qt5 qwt qwt6