From 6be540696cb6672602f7118c8578b3df78455278 Mon Sep 17 00:00:00 2001
From: Howard Butler <howard@hobu.co>
Date: Thu, 19 Sep 2019 13:32:38 -0500
Subject: set PROJ_LIB on test targets for CMake

---
 appveyor.yml             |  2 --
 cmake/ProjTest.cmake     |  5 +++++
 test/unit/CMakeLists.txt | 16 ++++++++++++++++
 travis/install.sh        |  2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index a631c3e8..d1f5aa65 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -50,8 +50,6 @@ build_script:
 
 test_script:
   - echo test_script
-  - set PROJ_LIB=%PROJ_DIR%\share\proj
-  - cd %PROJ_LIB%
   - curl -O https://download.osgeo.org/proj/proj-datumgrid-1.8.zip
   - 7z e -aoa -y proj-datumgrid-1.8.zip
   - cd %PROJ_BUILD%
diff --git a/cmake/ProjTest.cmake b/cmake/ProjTest.cmake
index 7404b59d..277e107a 100644
--- a/cmake/ProjTest.cmake
+++ b/cmake/ProjTest.cmake
@@ -26,6 +26,8 @@ function(proj_add_test_script_sh SH_NAME BIN_USE)
         COMMAND ${PROJECT_SOURCE_DIR}/test/cli/${SH_NAME}
         ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${${BIN_USE}}
       )
+    set_tests_properties( ${testname}
+        PROPERTIES ENVIRONMENT "PROJ_LIB=${PROJECT_BINARY_DIR}/data")
     endif()
 
   endif()
@@ -41,5 +43,8 @@ function(proj_add_gie_test TESTNAME TESTCASE)
       COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${GIE_BIN}
       ${TESTFILE}
     )
+    set_tests_properties( ${TESTNAME}
+        PROPERTIES ENVIRONMENT "PROJ_LIB=${PROJECT_BINARY_DIR}/data")
+
 
 endfunction()
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index 40a3dd06..841d72b3 100644
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -70,6 +70,9 @@ target_link_libraries(proj_pj_transform_test
   GTest::gtest
   ${PROJ_LIBRARIES})
 add_test(NAME proj_pj_transform_test COMMAND proj_pj_transform_test)
+set_property(TEST proj_pj_transform_test
+        PROPERTY ENVIRONMENT "PROJ_LIB=${PROJECT_BINARY_DIR}/data")
+
 
 add_executable(proj_errno_string_test
   main.cpp
@@ -78,6 +81,8 @@ target_link_libraries(proj_errno_string_test
   GTest::gtest
   ${PROJ_LIBRARIES})
 add_test(NAME proj_errno_string_test COMMAND proj_errno_string_test)
+set_property(TEST proj_errno_string_test
+        PROPERTY ENVIRONMENT "PROJ_LIB=${PROJECT_BINARY_DIR}/data")
 
 add_executable(proj_angular_io_test
   main.cpp
@@ -86,6 +91,8 @@ target_link_libraries(proj_angular_io_test
   GTest::gtest
   ${PROJ_LIBRARIES})
 add_test(NAME proj_angular_io_test COMMAND proj_angular_io_test)
+set_property(TEST proj_angular_io_test
+        PROPERTY ENVIRONMENT "PROJ_LIB=${PROJECT_BINARY_DIR}/data")
 
 add_executable(proj_context_test
   main.cpp
@@ -94,6 +101,8 @@ target_link_libraries(proj_context_test
   GTest::gtest
   ${PROJ_LIBRARIES})
 add_test(NAME proj_context_test COMMAND proj_context_test)
+set_property(TEST proj_context_test
+        PROPERTY ENVIRONMENT "PROJ_LIB=${PROJECT_BINARY_DIR}/data")
 
 if(MSVC AND BUILD_LIBPROJ_SHARED)
   # ph_phi2_test not compatible of a .dll build
@@ -105,6 +114,8 @@ else()
     GTest::gtest
     ${PROJ_LIBRARIES})
   add_test(NAME pj_phi2_test COMMAND pj_phi2_test)
+  set_property(TEST pj_phi2_test
+        PROPERTY ENVIRONMENT "PROJ_LIB=${PROJECT_BINARY_DIR}/data")
 endif()
 
 add_executable(proj_test_cpp_api
@@ -123,6 +134,9 @@ target_link_libraries(proj_test_cpp_api
   ${PROJ_LIBRARIES}
   ${SQLITE3_LIBRARY})
 add_test(NAME proj_test_cpp_api COMMAND proj_test_cpp_api)
+set_property(TEST proj_test_cpp_api
+        PROPERTY ENVIRONMENT "PROJ_LIB=${PROJECT_BINARY_DIR}/data")
+
 
 add_executable(gie_self_tests
   main.cpp
@@ -131,3 +145,5 @@ target_link_libraries(gie_self_tests
   GTest::gtest
   ${PROJ_LIBRARIES})
 add_test(NAME gie_self_tests COMMAND gie_self_tests)
+set_property(TEST gie_self_tests
+        PROPERTY ENVIRONMENT "PROJ_LIB=${PROJECT_BINARY_DIR}/data")
diff --git a/travis/install.sh b/travis/install.sh
index b2e13c12..e0367047 100755
--- a/travis/install.sh
+++ b/travis/install.sh
@@ -86,7 +86,7 @@ VERBOSE=1 make -j${NPROC}
 make install
 # The cmake build is not able to generate the null file, so copy it at hand
 cp /tmp/proj_autoconf_install_from_dist_all/share/proj/null /tmp/proj_cmake_install/share/proj
-PROJ_LIB=/tmp/proj_cmake_install/share/proj ctest
+ctest
 find /tmp/proj_cmake_install
 cd ..
 
-- 
cgit v1.2.3


From 29ddc39d242b95c2de477a657bdceb703676a65e Mon Sep 17 00:00:00 2001
From: Howard Butler <howard@hobu.co>
Date: Thu, 19 Sep 2019 15:00:46 -0500
Subject: address PR comments

---
 appveyor.yml      | 2 ++
 travis/install.sh | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index d1f5aa65..a631c3e8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -50,6 +50,8 @@ build_script:
 
 test_script:
   - echo test_script
+  - set PROJ_LIB=%PROJ_DIR%\share\proj
+  - cd %PROJ_LIB%
   - curl -O https://download.osgeo.org/proj/proj-datumgrid-1.8.zip
   - 7z e -aoa -y proj-datumgrid-1.8.zip
   - cd %PROJ_BUILD%
diff --git a/travis/install.sh b/travis/install.sh
index e0367047..2363be43 100755
--- a/travis/install.sh
+++ b/travis/install.sh
@@ -84,8 +84,6 @@ cd build_cmake
 cmake .. -DCMAKE_INSTALL_PREFIX=/tmp/proj_cmake_install
 VERBOSE=1 make -j${NPROC}
 make install
-# The cmake build is not able to generate the null file, so copy it at hand
-cp /tmp/proj_autoconf_install_from_dist_all/share/proj/null /tmp/proj_cmake_install/share/proj
 ctest
 find /tmp/proj_cmake_install
 cd ..
-- 
cgit v1.2.3