diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-01-17 00:24:03 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2020-01-17 00:52:19 +0100 |
| commit | 4724025e6c817761052fc0dc8810fd489a9e0104 (patch) | |
| tree | 21117e52f95b8f36880efef8cd71c1fcec21242c /cmake | |
| parent | 66fd99a8831955034cb25c8468ecfe1f9d3a7d62 (diff) | |
| parent | d76e6202d27c730b4dcbf16b8c1575c11b703485 (diff) | |
| download | PROJ-4724025e6c817761052fc0dc8810fd489a9e0104.tar.gz PROJ-4724025e6c817761052fc0dc8810fd489a9e0104.zip | |
Merge branch 'master' into rfc4_merge_back_master
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/ProjConfig.cmake | 1 | ||||
| -rw-r--r-- | cmake/ProjTest.cmake | 11 | ||||
| -rw-r--r-- | cmake/proj_config.cmake.in | 6 |
3 files changed, 3 insertions, 15 deletions
diff --git a/cmake/ProjConfig.cmake b/cmake/ProjConfig.cmake index 3f0b3d2e..9f1b4e44 100644 --- a/cmake/ProjConfig.cmake +++ b/cmake/ProjConfig.cmake @@ -14,7 +14,6 @@ include(CheckFunctionExists) # check needed include file check_include_files(dlfcn.h HAVE_DLFCN_H) check_include_files(inttypes.h HAVE_INTTYPES_H) -check_include_files(jni.h HAVE_JNI_H) check_include_files(memory.h HAVE_MEMORY_H) check_include_files(stdint.h HAVE_STDINT_H) check_include_files(stdlib.h HAVE_STDLIB_H) diff --git a/cmake/ProjTest.cmake b/cmake/ProjTest.cmake index ad612970..7797ed83 100644 --- a/cmake/ProjTest.cmake +++ b/cmake/ProjTest.cmake @@ -3,13 +3,8 @@ # function(proj_test_set_properties TESTNAME) - if(MSVC) - set_tests_properties( ${TESTNAME} - 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_IGNORE_USER_WRITABLE_DIRECTORY=YES;PROJ_LIB=${PROJECT_BINARY_DIR}/data:${PROJECT_SOURCE_DIR}/data") - endif() + set_tests_properties( ${TESTNAME} + PROPERTIES ENVIRONMENT "PROJ_IGNORE_USER_WRITABLE_DIRECTORY=YES;PROJ_LIB=${PROJECT_BINARY_DIR}/data/for_tests") endfunction() function(proj_add_test_script_sh SH_NAME BIN_USE) @@ -36,6 +31,7 @@ function(proj_add_test_script_sh SH_NAME BIN_USE) COMMAND ${PROJECT_SOURCE_DIR}/test/cli/${SH_NAME} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${${BIN_USE}} ) + proj_test_set_properties(${testname}) endif() @@ -52,7 +48,6 @@ function(proj_add_gie_test TESTNAME TESTCASE) COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${GIE_BIN} ${TESTFILE} ) - proj_test_set_properties(${TESTNAME}) endfunction() diff --git a/cmake/proj_config.cmake.in b/cmake/proj_config.cmake.in index caeb0934..d8385ce9 100644 --- a/cmake/proj_config.cmake.in +++ b/cmake/proj_config.cmake.in @@ -4,9 +4,6 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #cmakedefine HAVE_INTTYPES_H 1 -/* Define to 1 if you have the <jni.h> header file. */ -#cmakedefine HAVE_JNI_H 1 - /* Define to 1 if you have the `m' library (-lm). */ #cmakedefine HAVE_LIBM 1 @@ -40,9 +37,6 @@ /* Define to 1 if you have the <unistd.h> header file. */ #cmakedefine HAVE_UNISTD_H 1 -/* Enabled for Java/JNI Support */ -#cmakedefine JNI_ENABLED 1 - /* Name of package */ #cmakedefine PACKAGE "${PACKAGE}" |