aboutsummaryrefslogtreecommitdiff
path: root/cmake/ProjTest.cmake
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2020-01-20 15:01:33 +0100
committerGitHub <noreply@github.com>2020-01-20 15:01:33 +0100
commita6390b59ae2bad2a763e7ab3341ee4c80e708b3d (patch)
tree26d5016def90e3e9f71a51da694ff3028e1006ed /cmake/ProjTest.cmake
parentf1209ff020cc9f5490f8e6c7edced6877f53da49 (diff)
parent90b6685a990b8c4931aafb508853401a89163e78 (diff)
downloadPROJ-a6390b59ae2bad2a763e7ab3341ee4c80e708b3d.tar.gz
PROJ-a6390b59ae2bad2a763e7ab3341ee4c80e708b3d.zip
Merge pull request #1826 from rouault/rfc4_code_review
[RFC4_dev] Address code review comments
Diffstat (limited to 'cmake/ProjTest.cmake')
-rw-r--r--cmake/ProjTest.cmake8
1 files changed, 4 insertions, 4 deletions
diff --git a/cmake/ProjTest.cmake b/cmake/ProjTest.cmake
index 6abfbcd7..a016cd9a 100644
--- a/cmake/ProjTest.cmake
+++ b/cmake/ProjTest.cmake
@@ -28,10 +28,10 @@ function(proj_add_test_script_sh SH_NAME BIN_USE)
)
if(MSVC)
set_tests_properties( ${testname}
- PROPERTIES ENVIRONMENT "PROJ_LIB=${PROJECT_BINARY_DIR}/data\\;${PROJECT_SOURCE_DIR}/data")
+ PROPERTIES ENVIRONMENT "PROJ_IGNORE_USER_WRITABLE_DIRECTORY=YES;PROJ_LIB=${PROJECT_BINARY_DIR}/data\\;${PROJECT_SOURCE_DIR}/data")
else()
set_tests_properties( ${testname}
- PROPERTIES ENVIRONMENT "PROJ_LIB=${PROJECT_BINARY_DIR}/data:${PROJECT_SOURCE_DIR}/data")
+ PROPERTIES ENVIRONMENT "PROJ_IGNORE_USER_WRITABLE_DIRECTORY=YES;PROJ_LIB=${PROJECT_BINARY_DIR}/data:${PROJECT_SOURCE_DIR}/data")
endif()
endif()
@@ -51,10 +51,10 @@ function(proj_add_gie_test TESTNAME TESTCASE)
if(MSVC)
set_tests_properties( ${TESTNAME}
- PROPERTIES ENVIRONMENT "PROJ_LIB=${PROJECT_BINARY_DIR}/data\\;${PROJECT_SOURCE_DIR}/data")
+ PROPERTIES ENVIRONMENT "PROJ_IGNORE_USER_WRITABLE_DIRECTORY=YES;PROJ_LIB=${PROJECT_BINARY_DIR}/data\\;${PROJECT_SOURCE_DIR}/data")
else()
set_tests_properties( ${TESTNAME}
- PROPERTIES ENVIRONMENT "PROJ_LIB=${PROJECT_BINARY_DIR}/data:${PROJECT_SOURCE_DIR}/data")
+ PROPERTIES ENVIRONMENT "PROJ_IGNORE_USER_WRITABLE_DIRECTORY=YES;PROJ_LIB=${PROJECT_BINARY_DIR}/data:${PROJECT_SOURCE_DIR}/data")
endif()