From 54fdb90a204a39342bfcbab197e3b5da47a9f1cd Mon Sep 17 00:00:00 2001
From: Mike Taves <mwtoews@gmail.com>
Date: Sat, 28 Mar 2020 12:44:30 +1300
Subject: CMake: prefer to use use PROJ_SOURCE_DIR and PROJ_BINARY_DIR (#2100)

* Use instead of CMAKE_SOURCE_DIR and CMAKE_BINARY_DIR
* Also PROJECT_SOURCE_DIR and PROJECT_BINARY_DIR, which are similar
* Set properties with a list variable rather than a long line
* Correction to 'proj_test_set_properties' function, rename ENVIRONMENT:
  - PROJ_IGNORE_USER_WRITABLE_DIRECTORY     (ignored)
  - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY  (used by filemanager.cpp)
---
 cmake/ProjTest.cmake | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'cmake/ProjTest.cmake')

diff --git a/cmake/ProjTest.cmake b/cmake/ProjTest.cmake
index 04f40c5d..7833c78d 100644
--- a/cmake/ProjTest.cmake
+++ b/cmake/ProjTest.cmake
@@ -3,8 +3,10 @@
 #
 
 function(proj_test_set_properties TESTNAME)
-    set_tests_properties( ${TESTNAME}
-        PROPERTIES ENVIRONMENT "PROJ_IGNORE_USER_WRITABLE_DIRECTORY=YES;PROJ_LIB=${PROJECT_BINARY_DIR}/data/for_tests")
+  set_property(TEST ${TESTNAME}
+    PROPERTY ENVIRONMENT
+      "PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES"
+      "PROJ_LIB=${PROJ_BINARY_DIR}/data/for_tests")
 endfunction()
 
 function(proj_add_test_script_sh SH_NAME BIN_USE)
@@ -12,8 +14,8 @@ function(proj_add_test_script_sh SH_NAME BIN_USE)
     get_filename_component(testname ${SH_NAME} NAME_WE)
 
     add_test(NAME "${testname}"
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/data
-      COMMAND bash ${PROJECT_SOURCE_DIR}/test/cli/${SH_NAME}
+      WORKING_DIRECTORY ${PROJ_SOURCE_DIR}/data
+      COMMAND bash ${PROJ_SOURCE_DIR}/test/cli/${SH_NAME}
       ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${${BIN_USE}}
     )
     proj_test_set_properties(${testname})
@@ -25,9 +27,9 @@ endfunction()
 function(proj_add_gie_test TESTNAME TESTCASE)
 
     set(GIE_BIN $<TARGET_FILE_NAME:gie>)
-    set(TESTFILE ${CMAKE_SOURCE_DIR}/test/${TESTCASE})
+    set(TESTFILE ${PROJ_SOURCE_DIR}/test/${TESTCASE})
     add_test(NAME ${TESTNAME}
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/test
+      WORKING_DIRECTORY ${PROJ_SOURCE_DIR}/test
       COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${GIE_BIN}
       ${TESTFILE}
     )
-- 
cgit v1.2.3