diff options
| author | Mike Taves <mwtoews@gmail.com> | 2020-03-28 12:44:30 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-28 12:44:30 +1300 |
| commit | 54fdb90a204a39342bfcbab197e3b5da47a9f1cd (patch) | |
| tree | d4d8189638c263b3f203db15579a820c9eef214a /cmake | |
| parent | 238f48fb7cd006296cbd622ab9e4187139af9a8e (diff) | |
| download | PROJ-54fdb90a204a39342bfcbab197e3b5da47a9f1cd.tar.gz PROJ-54fdb90a204a39342bfcbab197e3b5da47a9f1cd.zip | |
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)
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/ProjConfig.cmake | 2 | ||||
| -rw-r--r-- | cmake/ProjTest.cmake | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/cmake/ProjConfig.cmake b/cmake/ProjConfig.cmake index fa085384..3dc2133b 100644 --- a/cmake/ProjConfig.cmake +++ b/cmake/ProjConfig.cmake @@ -41,7 +41,7 @@ set(PACKAGE_VERSION "${${PROJECT_NAME}_VERSION}") # check if a second proj_config.h exists (created by ./configure) # as this is within CMake's C_INCLUDES / CXX_INCLUDES -set(AUTOCONF_PROJ_CONFIG_H "${CMAKE_SOURCE_DIR}/src/proj_config.h") +set(AUTOCONF_PROJ_CONFIG_H "${PROJ_SOURCE_DIR}/src/proj_config.h") if(EXISTS ${AUTOCONF_PROJ_CONFIG_H}) message(WARNING "Autoconf's ${AUTOCONF_PROJ_CONFIG_H} may interfere with this " 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} ) |