File tree 1 file changed +7
-2
lines changed
1 file changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -26,7 +26,12 @@ MARK_AS_ADVANCED(PYTHON_EXECUTABLE)
26
26
MACRO (ADD_PYTHON_TEST TESTNAME FILENAME)
27
27
GET_SOURCE_FILE_PROPERTY (loc ${FILENAME} LOCATION )
28
28
GET_SOURCE_FILE_PROPERTY (pyenv ${FILENAME} PYTHONPATH)
29
-
29
+ #Avoid "NOTFOUND" string when setting LD_LIBRARY_PATH later
30
+ if (EXISTS "${pyenv} " )
31
+ set (pyenv "${pyenv} :" )
32
+ else ()
33
+ set (pyenv "" )
34
+ endif ()
30
35
IF (WIN32 )
31
36
STRING (REGEX REPLACE ":" " " wo_semicolon "${ARGN} " )
32
37
IF (USING_NINJA OR USING_NMAKE)
@@ -48,7 +53,7 @@ MESSAGE(\"PATH:\$ENV{PATH}\")
48
53
STRING (REGEX REPLACE ";" " " wo_semicolon "${ARGN} " )
49
54
FILE (WRITE ${CMAKE_CURRENT_BINARY_DIR} /${TESTNAME} .cmake "
50
55
SET(ENV{QGIS_PREFIX_PATH} \" ${QGIS_OUTPUT_DIRECTORY} \" )
51
- SET(ENV{LD_LIBRARY_PATH} \" ${pyenv} : ${QGIS_OUTPUT_DIRECTORY} /lib:\$ ENV{LD_LIBRARY_PATH}\" )
56
+ SET(ENV{LD_LIBRARY_PATH} \" ${pyenv}${QGIS_OUTPUT_DIRECTORY} /lib:\$ ENV{LD_LIBRARY_PATH}\" )
52
57
SET(ENV{PYTHONPATH} \" ${QGIS_OUTPUT_DIRECTORY} /python/:${QGIS_OUTPUT_DIRECTORY} /python/plugins:${CMAKE_SOURCE_DIR} /tests/src/python:\$ ENV{PYTHONPATH}\" )
53
58
MESSAGE(\" export LD_LIBRARY_PATH=\$ ENV{LD_LIBRARY_PATH}\" )
54
59
" )
You can’t perform that action at this time.
0 commit comments