Skip to content

Commit 8e78d20

Browse files
Rashad Kanavathnyalldawson
Rashad Kanavath
authored andcommitted
[test] Avoid "NOTFOUND" in LD_LIBRARY_PATH environment variable
1 parent 471865a commit 8e78d20

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

cmake/UsePythonTest.cmake

+7-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,12 @@ MARK_AS_ADVANCED(PYTHON_EXECUTABLE)
2626
MACRO(ADD_PYTHON_TEST TESTNAME FILENAME)
2727
GET_SOURCE_FILE_PROPERTY(loc ${FILENAME} LOCATION)
2828
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()
3035
IF(WIN32)
3136
STRING(REGEX REPLACE ":" " " wo_semicolon "${ARGN}")
3237
IF(USING_NINJA OR USING_NMAKE)
@@ -48,7 +53,7 @@ MESSAGE(\"PATH:\$ENV{PATH}\")
4853
STRING(REGEX REPLACE ";" " " wo_semicolon "${ARGN}")
4954
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}.cmake "
5055
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}\")
5257
SET(ENV{PYTHONPATH} \"${QGIS_OUTPUT_DIRECTORY}/python/:${QGIS_OUTPUT_DIRECTORY}/python/plugins:${CMAKE_SOURCE_DIR}/tests/src/python:\$ENV{PYTHONPATH}\")
5358
MESSAGE(\"export LD_LIBRARY_PATH=\$ENV{LD_LIBRARY_PATH}\")
5459
")

0 commit comments

Comments
 (0)