[proj4] Upgrade version to 6.1.1 and remove patches. (#7917)

* [proj4]Upgrade version to 6.1.1 and remove useless patches.

* [libgeotiff]Fix build errors using proj4 6.1.1.

* [libspatialite]Fix build errors using proj4 6.1.1.

* [gdal]Fix build errors using proj4 6.1.1.

* [spatialite-tools]Fix build errors using proj4 6.1.1.

* [spatialite-tools]Fix build errors using proj4 6.1.1.

* [libgeotiff]Re-fix build errors using proj4 6.1.1.

* [vtk]Fix build errors using proj4 6.1.1.

* [proj4]Fix find sqlite binary failure.

* [proj4]Disable build tools when building proj4 in arm/uwp.

* [sqlite3/libgeotiff]Fix libdl library linkage. Re-fix use proj issue.

* add back dl libs

* [gdal]Fix dependent port proj library name.

* [proj4]Set Windows library name to "proj" and revert fix-proj-name changes.

* [liblas]Fix build errors using proj4 6.1.1.

* [liblas]Fix build errors using proj4 6.1.1.

* [liblas]Fix build errors using proj4 6.1.1.

* [proj4]Fix feature database on triplet arm/uwp.

* [gdal]Remove useless flag PROJ_STATIC.

* [proj4]Fix build error on x64-windows-static.

* [liblas]Use find_library to get proj4/sqlite3 libraries.

* [proj4]Fix sqlite dependency.

* [proj4]Fix arm/uwp dependency.

* [proj4]Fix linux build: configure error.

* [proj4]Disable export proj4 namespace.

* [liblas]Delete proj dependency.

* [libspatialite]Fix linux build.

* [libspatialite]Fix linux command.

* [libspatialite]Fix configure error.

* [proj4]fix static cmake tools path.

* [libgeotiff]Set configure options to 1/0 to avoid the "if" comparison failure in config.cmake.
[proj4]Revert changes about namespace.
[liblas]Remove FindPROJ4.cmake and FindGeoTIFF.cmake from the source.

* [vtk]Fix using latest proj4 issue.

* [proj4]Delete missing patch.

2 files changed, 274 insertions, 136 deletions

diff --git a/ports/libspatialite/fix-linux-configure.patch b/ports/libspatialite/fix-linux-configure.patch
new file mode 100644
index 000000000..59afa8c49
--- /dev/null
+++ b/ports/libspatialite/fix-linux-configure.patch
@@ -0,0 +1,135 @@
+diff --git a/configure b/configure
+index aafdad5..fe46039 100644
+--- a/configure
++++ b/configure
+@@ -17448,6 +17448,7 @@ fi
+ #   --enable-proj
+ #
+ # Check whether --enable-proj was given.
++
+ if test "${enable_proj+set}" = set; then :
+   enableval=$enable_proj;
+ else
+@@ -17469,122 +17470,6 @@ fi
+ 
+ done
+ 
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pj_init_plus" >&5
+-$as_echo_n "checking for library containing pj_init_plus... " >&6; }
+-if ${ac_cv_search_pj_init_plus+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char pj_init_plus ();
+-int
+-main ()
+-{
+-return pj_init_plus ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-for ac_lib in '' proj; do
+-  if test -z "$ac_lib"; then
+-    ac_res="none required"
+-  else
+-    ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib -lm $ac_func_search_save_LIBS"
+-  fi
+-  if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_search_pj_init_plus=$ac_res
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext
+-  if ${ac_cv_search_pj_init_plus+:} false; then :
+-  break
+-fi
+-done
+-if ${ac_cv_search_pj_init_plus+:} false; then :
+-
+-else
+-  ac_cv_search_pj_init_plus=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pj_init_plus" >&5
+-$as_echo "$ac_cv_search_pj_init_plus" >&6; }
+-ac_res=$ac_cv_search_pj_init_plus
+-if test "$ac_res" != no; then :
+-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+-
+-else
+-  as_fn_error $? "'libproj' is required but it doesn't seem to be installed on this system." "$LINENO" 5
+-fi
+-
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pj_init_ctx" >&5
+-$as_echo_n "checking for library containing pj_init_ctx... " >&6; }
+-if ${ac_cv_search_pj_init_ctx+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char pj_init_ctx ();
+-int
+-main ()
+-{
+-return pj_init_ctx ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-for ac_lib in '' proj; do
+-  if test -z "$ac_lib"; then
+-    ac_res="none required"
+-  else
+-    ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib -lm $ac_func_search_save_LIBS"
+-  fi
+-  if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_search_pj_init_ctx=$ac_res
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext
+-  if ${ac_cv_search_pj_init_ctx+:} false; then :
+-  break
+-fi
+-done
+-if ${ac_cv_search_pj_init_ctx+:} false; then :
+-
+-else
+-  ac_cv_search_pj_init_ctx=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pj_init_ctx" >&5
+-$as_echo "$ac_cv_search_pj_init_ctx" >&6; }
+-ac_res=$ac_cv_search_pj_init_ctx
+-if test "$ac_res" != no; then :
+-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+-
+-else
+-  as_fn_error $? "'libproj' is required but the version on this system does not support the required features (Version 4.8.0 or later is needed)." "$LINENO" 5
+-fi
+-
+ else
+   $as_echo "#define OMIT_PROJ 1" >>confdefs.h
+ 
diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake
index f998d50d1..77e51b345 100644
--- a/ports/libspatialite/portfile.cmake
+++ b/ports/libspatialite/portfile.cmake
@@ -7,112 +7,111 @@ vcpkg_download_distfile(ARCHIVE
 )
 
 if (VCPKG_TARGET_IS_WINDOWS)
-	find_program(NMAKE nmake)
-
-	vcpkg_extract_source_archive_ex(
-		OUT_SOURCE_PATH SOURCE_PATH
-		ARCHIVE ${ARCHIVE}
-		PATCHES
-			${CMAKE_CURRENT_LIST_DIR}/fix-makefiles.patch
-			${CMAKE_CURRENT_LIST_DIR}/fix-sources.patch
-			${CMAKE_CURRENT_LIST_DIR}/fix-latin-literals.patch
-	)
-
-	# fix most of the problems when spacebar is in the path
-	set(CURRENT_INSTALLED_DIR "\"${CURRENT_INSTALLED_DIR}\"")
-
-	if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
-		set(CL_FLAGS_DBG "/MDd /Zi")
-		set(CL_FLAGS_REL "/MD /Ox")
-		set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib")
-		set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib")
-		set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib")
-		set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib")
-	else()
-		set(CL_FLAGS_DBG "/MTd /Zi")
-		set(CL_FLAGS_REL "/MT /Ox")
-		set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libgeos_c.lib ${CURRENT_INSTALLED_DIR}/lib/libgeos.lib")
-		set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libgeos_cd.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libgeosd.lib")
-		set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/lib/lzma.lib ws2_32.lib")
-		set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/debug/lib/lzmad.lib ws2_32.lib")
-	endif()
-
-	set(LIBS_ALL_DBG
-		"${CURRENT_INSTALLED_DIR}/debug/lib/libiconv.lib \
-		${CURRENT_INSTALLED_DIR}/debug/lib/libcharset.lib \
-		${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib \
-		${CURRENT_INSTALLED_DIR}/debug/lib/freexl.lib \
-		${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib \
-		${LIBXML2_LIBS_DBG} \
-		${GEOS_LIBS_DBG} \
-		${CURRENT_INSTALLED_DIR}/debug/lib/projd.lib"
-	   )
-	set(LIBS_ALL_REL
-		"${CURRENT_INSTALLED_DIR}/lib/libiconv.lib \
-		${CURRENT_INSTALLED_DIR}/lib/libcharset.lib \
-		${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib \
-		${CURRENT_INSTALLED_DIR}/lib/freexl.lib \
-		${CURRENT_INSTALLED_DIR}/lib/zlib.lib \
-		${LIBXML2_LIBS_REL} \
-		${GEOS_LIBS_REL} \
-		${CURRENT_INSTALLED_DIR}/lib/proj.lib"
-	   )
-
-	################
-	# Debug build
-	################
-	if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-		message(STATUS "Building ${TARGET_TRIPLET}-dbg")
-
-		file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/debug" INST_DIR_DBG)
-
-		vcpkg_execute_required_process(
-			COMMAND ${NMAKE} -f makefile.vc clean install
-			"INST_DIR=\"${INST_DIR_DBG}\"" INSTALLED_ROOT=${CURRENT_INSTALLED_DIR} "LINK_FLAGS=/debug" "CL_FLAGS=${CL_FLAGS_DBG}" "LIBS_ALL=${LIBS_ALL_DBG}"
-			WORKING_DIRECTORY ${SOURCE_PATH}
-			LOGNAME nmake-build-${TARGET_TRIPLET}-debug
-		)
-		message(STATUS "Building ${TARGET_TRIPLET}-dbg done")
-		vcpkg_copy_pdbs()
-	endif()
-
-	################
-	# Release build
-	################
-	if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-		message(STATUS "Building ${TARGET_TRIPLET}-rel")
-
-		file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR_REL)
-		vcpkg_execute_required_process(
-			COMMAND ${NMAKE} -f makefile.vc clean install
-			"INST_DIR=\"${INST_DIR_REL}\"" INSTALLED_ROOT=${CURRENT_INSTALLED_DIR} "LINK_FLAGS=" "CL_FLAGS=${CL_FLAGS_REL}" "LIBS_ALL=${LIBS_ALL_REL}"
-			WORKING_DIRECTORY ${SOURCE_PATH}
-			LOGNAME nmake-build-${TARGET_TRIPLET}-release
-		)
-		message(STATUS "Building ${TARGET_TRIPLET}-rel done")
-	endif()
-
-
-	file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-	file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libspatialite RENAME copyright)
-
-	if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-	  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
-	  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
-	  file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/spatialite_i.lib)
-	  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib)
-	else()
-	  file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/spatialite.lib)
-	  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib)
-	  if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-		file(RENAME ${CURRENT_PACKAGES_DIR}/lib/spatialite_i.lib ${CURRENT_PACKAGES_DIR}/lib/spatialite.lib)
-	  endif()
-	  if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-		file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib)
-	  endif()
-	endif()
-
-	message(STATUS "Packaging ${TARGET_TRIPLET} done")
+    find_program(NMAKE nmake)
+
+    vcpkg_extract_source_archive_ex(
+        OUT_SOURCE_PATH SOURCE_PATH
+        ARCHIVE ${ARCHIVE}
+        PATCHES
+            fix-makefiles.patch
+            fix-sources.patch
+            fix-latin-literals.patch
+    )
+
+    # fix most of the problems when spacebar is in the path
+    set(CURRENT_INSTALLED_DIR "\"${CURRENT_INSTALLED_DIR}\"")
+
+    if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
+        set(CL_FLAGS_DBG "/MDd /Zi /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H")
+        set(CL_FLAGS_REL "/MD /Ox /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H")
+        set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib")
+        set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib")
+        set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib")
+        set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib")
+    else()
+        set(CL_FLAGS_DBG "/MTd /Zi /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H")
+        set(CL_FLAGS_REL "/MT /Ox /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H")
+        set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libgeos_c.lib ${CURRENT_INSTALLED_DIR}/lib/libgeos.lib")
+        set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libgeos_cd.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libgeosd.lib")
+        set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/lib/lzma.lib ws2_32.lib")
+        set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/debug/lib/lzmad.lib ws2_32.lib")
+    endif()
+
+    set(LIBS_ALL_DBG
+        "${CURRENT_INSTALLED_DIR}/debug/lib/libiconv.lib \
+        ${CURRENT_INSTALLED_DIR}/debug/lib/libcharset.lib \
+        ${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib \
+        ${CURRENT_INSTALLED_DIR}/debug/lib/freexl.lib \
+        ${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib \
+        ${LIBXML2_LIBS_DBG} \
+        ${GEOS_LIBS_DBG} \
+        ${CURRENT_INSTALLED_DIR}/debug/lib/proj_d.lib"
+       )
+    set(LIBS_ALL_REL
+        "${CURRENT_INSTALLED_DIR}/lib/libiconv.lib \
+        ${CURRENT_INSTALLED_DIR}/lib/libcharset.lib \
+        ${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib \
+        ${CURRENT_INSTALLED_DIR}/lib/freexl.lib \
+        ${CURRENT_INSTALLED_DIR}/lib/zlib.lib \
+        ${LIBXML2_LIBS_REL} \
+        ${GEOS_LIBS_REL} \
+        ${CURRENT_INSTALLED_DIR}/lib/proj.lib"
+       )
+
+    ################
+    # Debug build
+    ################
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        message(STATUS "Building ${TARGET_TRIPLET}-dbg")
+
+        file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/debug" INST_DIR_DBG)
+
+        vcpkg_execute_required_process(
+            COMMAND ${NMAKE} -f makefile.vc clean install
+            "INST_DIR=\"${INST_DIR_DBG}\"" INSTALLED_ROOT=${CURRENT_INSTALLED_DIR} "LINK_FLAGS=/debug" "CL_FLAGS=${CL_FLAGS_DBG}" "LIBS_ALL=${LIBS_ALL_DBG}"
+            WORKING_DIRECTORY ${SOURCE_PATH}
+            LOGNAME nmake-build-${TARGET_TRIPLET}-debug
+        )
+        message(STATUS "Building ${TARGET_TRIPLET}-dbg done")
+        vcpkg_copy_pdbs()
+    endif()
+
+    ################
+    # Release build
+    ################
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        message(STATUS "Building ${TARGET_TRIPLET}-rel")
+
+        file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR_REL)
+        vcpkg_execute_required_process(
+            COMMAND ${NMAKE} -f makefile.vc clean install
+            "INST_DIR=\"${INST_DIR_REL}\"" INSTALLED_ROOT=${CURRENT_INSTALLED_DIR} "LINK_FLAGS=" "CL_FLAGS=${CL_FLAGS_REL}" "LIBS_ALL=${LIBS_ALL_REL}"
+            WORKING_DIRECTORY ${SOURCE_PATH}
+            LOGNAME nmake-build-${TARGET_TRIPLET}-release
+        )
+        message(STATUS "Building ${TARGET_TRIPLET}-rel done")
+    endif()
+
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+    file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libspatialite RENAME copyright)
+
+    if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
+      file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+      file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+      file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/spatialite_i.lib)
+      file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib)
+    else()
+      file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/spatialite.lib)
+      file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib)
+      if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        file(RENAME ${CURRENT_PACKAGES_DIR}/lib/spatialite_i.lib ${CURRENT_PACKAGES_DIR}/lib/spatialite.lib)
+      endif()
+      if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib)
+      endif()
+    endif()
+
+    message(STATUS "Packaging ${TARGET_TRIPLET} done")
 elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX
   # Check build system first
   find_program(MAKE make)
@@ -124,38 +123,40 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX
     ################
     # Release build
     ################    
-	vcpkg_extract_source_archive_ex(
-		OUT_SOURCE_PATH SOURCE_PATH_RELEASE
-		ARCHIVE ${ARCHIVE}
-		REF  release
-		PATCHES
-			${CMAKE_CURRENT_LIST_DIR}/fix-sources.patch
-			${CMAKE_CURRENT_LIST_DIR}/fix-latin-literals.patch
-	)
+    vcpkg_extract_source_archive_ex(
+        OUT_SOURCE_PATH SOURCE_PATH_RELEASE
+        ARCHIVE ${ARCHIVE}
+        REF  release
+        PATCHES
+            fix-sources.patch
+            fix-latin-literals.patch
+            fix-linux-configure.patch
+    )
     message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
     set(OUT_PATH_RELEASE ${SOURCE_PATH_RELEASE}/../../make-build-${TARGET_TRIPLET}-release)
-	file(REMOVE_RECURSE ${OUT_PATH_RELEASE})
+    file(REMOVE_RECURSE ${OUT_PATH_RELEASE})
     file(MAKE_DIRECTORY ${OUT_PATH_RELEASE})
     set(prefix ${CURRENT_INSTALLED_DIR})
     set(exec_prefix ${prefix}/bin)
     set(includedir ${prefix}/include)
     set(libdir ${prefix}/lib)
-	configure_file(${CMAKE_CURRENT_LIST_DIR}/geos-config.in
+    configure_file(${CMAKE_CURRENT_LIST_DIR}/geos-config.in
                    ${SOURCE_PATH_RELEASE}/geos-config @ONLY)
-	vcpkg_execute_required_process(
+    vcpkg_execute_required_process(
       COMMAND chmod -R 777 ${SOURCE_PATH_RELEASE}/geos-config
       WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
       LOGNAME config-${TARGET_TRIPLET}-rel
     )
     vcpkg_execute_required_process(
-      COMMAND "${SOURCE_PATH_RELEASE}/configure" --prefix=${OUT_PATH_RELEASE} "CFLAGS=-I${includedir} ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE}" "LDFLAGS=-L${libdir}" "LIBS=-lpthread -ldl" "--with-geosconfig=${SOURCE_PATH_RELEASE}/geos-config" "LIBXML2_LIBS=-lxml2 -llzma" "LIBXML2_CFLAGS=${includedir}"
+      COMMAND "${SOURCE_PATH_RELEASE}/configure" --prefix=${OUT_PATH_RELEASE} "CFLAGS=-I${includedir} ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE} -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" "LDFLAGS=-L${libdir}" "LIBS=-lpthread -ldl -lproj" "--with-geosconfig=${SOURCE_PATH_RELEASE}/geos-config" "LIBXML2_LIBS=-lxml2 -llzma" "LIBXML2_CFLAGS=${includedir}"
       WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
       LOGNAME config-${TARGET_TRIPLET}-rel
     )
 
     message(STATUS "Building ${TARGET_TRIPLET}-rel")
-    vcpkg_execute_required_process(
-      COMMAND make
+    vcpkg_execute_build_process(
+      COMMAND make -j ${VCPKG_CONCURRENCY}
+      NO_PARALLEL_COMMAND make
       WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
       LOGNAME make-build-${TARGET_TRIPLET}-release
     )
@@ -180,39 +181,41 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX
     ################
     # Debug build
     ################    
-	vcpkg_extract_source_archive_ex(
-		OUT_SOURCE_PATH SOURCE_PATH_DEBUG
-		ARCHIVE ${ARCHIVE}
-		REF  debug
-		PATCHES
-			${CMAKE_CURRENT_LIST_DIR}/fix-sources.patch
-			${CMAKE_CURRENT_LIST_DIR}/fix-latin-literals.patch
-			${CMAKE_CURRENT_LIST_DIR}/fix-configure-debug.patch
-	)
+    vcpkg_extract_source_archive_ex(
+        OUT_SOURCE_PATH SOURCE_PATH_DEBUG
+        ARCHIVE ${ARCHIVE}
+        REF  debug
+        PATCHES
+            fix-sources.patch
+            fix-latin-literals.patch
+            fix-configure-debug.patch
+            fix-linux-configure.patch
+    )
     message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
     set(OUT_PATH_DEBUG ${SOURCE_PATH_DEBUG}/../../make-build-${TARGET_TRIPLET}-debug)
-	file(REMOVE_RECURSE ${OUT_PATH_DEBUG})
+    file(REMOVE_RECURSE ${OUT_PATH_DEBUG})
     file(MAKE_DIRECTORY ${OUT_PATH_DEBUG})
-	set(prefix ${CURRENT_INSTALLED_DIR})
+    set(prefix ${CURRENT_INSTALLED_DIR})
     set(exec_prefix ${prefix}/debug/bin)
-	set(includedir ${prefix}/include)
+    set(includedir ${prefix}/include)
     set(libdir ${prefix}/debug/lib)
     configure_file(${CMAKE_CURRENT_LIST_DIR}/geos-config-debug.in
                    ${SOURCE_PATH_DEBUG}/geos-config @ONLY)
-	vcpkg_execute_required_process(
+    vcpkg_execute_required_process(
       COMMAND chmod -R 777 ${SOURCE_PATH_DEBUG}/geos-config
       WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
       LOGNAME config-${TARGET_TRIPLET}-debug
     )
     vcpkg_execute_required_process(
-      COMMAND "${SOURCE_PATH_DEBUG}/configure" --prefix=${OUT_PATH_DEBUG}  "CFLAGS=-I${includedir} ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG}" "LDFLAGS=-L${libdir}" "LIBS=-lpthread -ldl" "--with-geosconfig=${SOURCE_PATH_DEBUG}/geos-config" "LIBXML2_LIBS=-lxml2 -llzmad" "LIBXML2_CFLAGS=${includedir}"
+      COMMAND "${SOURCE_PATH_DEBUG}/configure" --prefix=${OUT_PATH_DEBUG}  "CFLAGS=-I${includedir} ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG} -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" "LDFLAGS=-L${libdir}" "LIBS=-lpthread -ldl -lproj" "--with-geosconfig=${SOURCE_PATH_DEBUG}/geos-config" "LIBXML2_LIBS=-lxml2 -llzmad" "LIBXML2_CFLAGS=${includedir}"
       WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
       LOGNAME config-${TARGET_TRIPLET}-debug
     )
 
     message(STATUS "Building ${TARGET_TRIPLET}-dbg")
-    vcpkg_execute_required_process(
-      COMMAND make
+    vcpkg_execute_build_process(
+      COMMAND make -j ${VCPKG_CONCURRENCY}
+      NO_PARALLEL_COMMAND make
       WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
       LOGNAME make-build-${TARGET_TRIPLET}-debug
     )