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) --- src/lib_proj.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index d08a0ddf..8978e20f 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -292,7 +292,7 @@ source_group("Source Files\\Transformations" source_group("Source Files\\ISO19111" FILES ${SRC_LIBPROJ_ISO19111}) -include_directories(${CMAKE_SOURCE_DIR}/include) +include_directories(${PROJ_SOURCE_DIR}/include) include_directories(${CMAKE_CURRENT_BINARY_DIR}) source_group("CMake Files" FILES CMakeLists.txt) -- cgit v1.2.3