From 54fdb90a204a39342bfcbab197e3b5da47a9f1cd Mon Sep 17 00:00:00 2001 From: Mike Taves 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/ProjConfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake/ProjConfig.cmake') 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 " -- cgit v1.2.3