diff --git a/CMakeLists.txt b/CMakeLists.txt index fa96674dd25..2c9c59a31f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,11 +19,6 @@ endif() # don't relink it only the shared object changes set(CMAKE_LINK_DEPENDS_NO_SHARED ON) -# This needs to be set before any add_directory in order to be visible -# by the subdirectories -set(QGIS_TEST_TMP_DIR "${CMAKE_BINARY_DIR}/tmp") -message (STATUS "Ctest Temp Directory set to: ${QGIS_TEST_TMP_DIR}") - ############################################################# # Project and version set(CPACK_PACKAGE_VERSION_MAJOR "3") diff --git a/cmake/UsePythonTest.cmake b/cmake/UsePythonTest.cmake index 18593162ca9..874d22c3a64 100644 --- a/cmake/UsePythonTest.cmake +++ b/cmake/UsePythonTest.cmake @@ -77,9 +77,6 @@ macro(ADD_PYTHON_TEST TESTNAME FILENAME) set_tests_properties(${TESTNAME} PROPERTIES TIMEOUT ${TEST_TIMEOUT}) endif() - set_tests_properties(${TESTNAME} PROPERTIES - FIXTURES_REQUIRED SOURCETREE - ENVIRONMENT "TMPDIR=${QGIS_TEST_TMP_DIR};QGIS_CUSTOM_CONFIG_PATH=${QGIS_TEST_TMP_DIR}/config" - ) + set_tests_properties(${TESTNAME} PROPERTIES FIXTURES_REQUIRED SOURCETREE) endmacro(ADD_PYTHON_TEST) diff --git a/tests/src/CMakeLists.txt b/tests/src/CMakeLists.txt index 92f88aec1eb..a653575ad4d 100644 --- a/tests/src/CMakeLists.txt +++ b/tests/src/CMakeLists.txt @@ -26,11 +26,7 @@ if (ENABLE_TESTS) set_tests_properties(${TESTNAME} PROPERTIES LABELS ${ARG_QGIS_TEST_LABELS}) endif() - set_tests_properties(${TESTNAME} PROPERTIES - FIXTURES_REQUIRED SOURCETREE - ENVIRONMENT "TMPDIR=${QGIS_TEST_TMP_DIR};QGIS_CUSTOM_CONFIG_PATH=${QGIS_TEST_TMP_DIR}/config" - ) - + set_tests_properties(${TESTNAME} PROPERTIES FIXTURES_REQUIRED SOURCETREE) target_compile_definitions(${TESTNAME} PRIVATE "CMAKE_SOURCE_DIR=\"${CMAKE_SOURCE_DIR}\"") endmacro()