sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-22 00:06:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Use a centralized directory for files created by ctest"

Browse Source 
This reverts commit 2e85f6fa29da4e7f94a95656b470fa28b760dcab.
This commit is contained in:
Nyall Dawson 2024-06-26 10:29:16 +10:00
parent 2fb1de2ce1
commit d64fbe2ade
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -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")

5
cmake/UsePythonTest.cmake
View File

@ -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)

6
tests/src/CMakeLists.txt
View File

@ -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()