diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-07-01 13:14:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-01 13:14:53 -0700 |
| commit | 0b9cf040bafa0a8ed064e47459779d72fcf9b9c4 (patch) | |
| tree | 53036c9f0b7f051abe737376f7ddeeeccd9948d0 /ports/proj4 | |
| parent | 34d19da9ffd0571bf16190ec4a16a04bef265900 (diff) | |
| parent | 77cfd20b83e71a0c513658e7c4d049d4039905af (diff) | |
| download | vcpkg-0b9cf040bafa0a8ed064e47459779d72fcf9b9c4.tar.gz vcpkg-0b9cf040bafa0a8ed064e47459779d72fcf9b9c4.zip | |
Merge branch 'master' into openssl-unix-dynamic
Diffstat (limited to 'ports/proj4')
| -rw-r--r-- | ports/proj4/CONTROL | 3 | ||||
| -rw-r--r-- | ports/proj4/portfile.cmake | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/ports/proj4/CONTROL b/ports/proj4/CONTROL index cf2519b12..265b8173d 100644 --- a/ports/proj4/CONTROL +++ b/ports/proj4/CONTROL @@ -1,3 +1,4 @@ Source: proj4 -Version: 4.9.3-1 +Version: 4.9.3-3 +Homepage: https://download.osgeo.org/proj Description: PROJ.4 library for cartographic projections diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index 64974e4ba..b34f04ac3 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -18,10 +18,16 @@ vcpkg_extract_source_archive_ex( 0003-CMake-configurable-cmake-config-install-location.patch ) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(VCPKG_BUILD_SHARED_LIBS ON) +else() + set(VCPKG_BUILD_SHARED_LIBS OFF) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS - -DBUILD_LIBPROJ_SHARED=${BUILD_SHARED_LIBS} + -DBUILD_LIBPROJ_SHARED=${VCPKG_BUILD_SHARED_LIBS} -DPROJ_LIB_SUBDIR=lib -DPROJ_INCLUDE_SUBDIR=include -DPROJ_DATA_SUBDIR=share/proj4 @@ -34,7 +40,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/proj4) +vcpkg_fixup_cmake_targets() # Rename library and adapt cmake configuration if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") |