Skip to content

Commit 9e73629

Browse files
committed
Fix package data and svg paths for cmake and pyqgis tests on Mac
1 parent 6811abd commit 9e73629

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

cmake/UsePythonTest.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ ELSE(WIN32)
4545
SET(ENV{PYTHONPATH} \"${QGIS_OUTPUT_DIRECTORY}/python/:\$ENV{PYTHONPATH}\")
4646
MESSAGE(\"LD_LIBRARY_PATH:\$ENV{LD_LIBRARY_PATH}\")
4747
ENDIF(WIN32)
48+
49+
IF(APPLE)
50+
SET(ENV{QGIS_MAC_PKGDATA_DIR} \"${CMAKE_SOURCE_DIR}\")
51+
SET(ENV{QGIS_MAC_SVG_DIR} \"${CMAKE_SOURCE_DIR}/images/svg\")
52+
ENDIF(APPLE)
53+
4854
MESSAGE(\"PYTHONPATH:\$ENV{PYTHONPATH}\")
4955
MESSAGE(STATUS \"Running ${PYTHON_EXECUTABLE} ${loc} ${wo_semicolon}\")
5056
EXECUTE_PROCESS(

tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
IF (ENABLE_TESTS)
22
IF (APPLE)
33
# override default data path, otherwise looks for Resources in app bundle
4-
SET (QGIS_DATA_SUBDIR "${CMAKE_CURRENT_SOURCE_DIR}/resources")
4+
SET (QGIS_DATA_SUBDIR "${CMAKE_SOURCE_DIR}/resources")
55
ENDIF (APPLE)
66
ADD_SUBDIRECTORY(src)
77
ADD_SUBDIRECTORY(bench)

tests/src/python/utilities.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,18 @@ def getQgisTestApp():
7373
myUseDefaultPathFlag = True
7474
QGISAPP.setPrefixPath(myPath, myUseDefaultPathFlag)
7575

76+
if sys.platform.startswith('darwin'):
77+
# override resource paths, otherwise looks for Resources in app
78+
if 'QGIS_MAC_PKGDATA_DIR' in os.environ:
79+
myPkgPath = os.environ['QGIS_MAC_PKGDATA_DIR']
80+
QGISAPP.setPkgDataPath(myPkgPath)
81+
if 'QGIS_MAC_SVG_DIR' in os.environ:
82+
mySVGPath = os.environ['QGIS_MAC_SVG_DIR']
83+
mySVGPaths = QGISAPP.svgPaths()
84+
# doesn't get rid of incorrect path, just adds correct one
85+
mySVGPaths.prepend(mySVGPath)
86+
QGISAPP.setDefaultSvgPaths(mySVGPaths)
87+
7688
QGISAPP.initQgis()
7789
s = QGISAPP.showSettings()
7890
print s

0 commit comments

Comments
 (0)