diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-09-19 12:50:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-19 12:50:16 +0200 |
| commit | 4ea0c2d72c80120a6074b97577a2659e23015f5c (patch) | |
| tree | fababdffc9751602fab1930f2b6413f424667977 /cmake | |
| parent | 722b2a4ea7ea329fabea4dd92ca1b2c60799f0d7 (diff) | |
| parent | eb2862c80971f106c69bfb46e8324104634fe1f2 (diff) | |
| download | PROJ-4ea0c2d72c80120a6074b97577a2659e23015f5c.tar.gz PROJ-4ea0c2d72c80120a6074b97577a2659e23015f5c.zip | |
Merge pull request #1125 from rouault/rename_nad_as_data
Rename nad/ as data/ and move nad/test* to test/old/*
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/ProjTest.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/ProjTest.cmake b/cmake/ProjTest.cmake index ec56afd2..9d886f5e 100644 --- a/cmake/ProjTest.cmake +++ b/cmake/ProjTest.cmake @@ -9,7 +9,7 @@ function(proj_add_test_script_sh SH_NAME BIN_USE) set(TEST_OK 1) if(ARGV2) set(TEST_OK 0) - set(GRID_FULLNAME ${PROJECT_SOURCE_DIR}/nad/${ARGV2}) + set(GRID_FULLNAME ${PROJECT_SOURCE_DIR}/data/${ARGV2}) if(EXISTS ${GRID_FULLNAME}) set(TEST_OK 1) endif(EXISTS ${GRID_FULLNAME}) @@ -22,8 +22,8 @@ function(proj_add_test_script_sh SH_NAME BIN_USE) if(${TEST_OK}) add_test( NAME "${testname}" - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/nad - COMMAND ${PROJECT_SOURCE_DIR}/nad/${SH_NAME} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/data + COMMAND ${PROJECT_SOURCE_DIR}/test/old/${SH_NAME} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${${BIN_USE}} ) endif(${TEST_OK}) |