diff --git a/ci/custom-triplets/arm64-linux-dynamic-release.cmake b/ci/custom-triplets/arm64-linux-dynamic-release.cmake new file mode 100644 index 00000000..e82b3768 --- /dev/null +++ b/ci/custom-triplets/arm64-linux-dynamic-release.cmake @@ -0,0 +1,9 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_CMAKE_SYSTEM_NAME Linux) +set(VCPKG_BUILD_TYPE release) + +set(VCPKG_LIBRARY_LINKAGE static) +if(PORT MATCHES "gdal") + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() diff --git a/ci/custom-triplets/arm64-osx-dynamic-release.cmake b/ci/custom-triplets/arm64-osx-dynamic-release.cmake new file mode 100644 index 00000000..def957a4 --- /dev/null +++ b/ci/custom-triplets/arm64-osx-dynamic-release.cmake @@ -0,0 +1,11 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_CMAKE_SYSTEM_NAME Darwin) +set(VCPKG_OSX_ARCHITECTURES arm64) +set(VCPKG_BUILD_TYPE release) +set(VCPKG_OSX_DEPLOYMENT_TARGET "12.0") + +set(VCPKG_LIBRARY_LINKAGE static) +if(PORT MATCHES "gdal") + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() diff --git a/ci/custom-triplets/x64-linux-dynamic.cmake b/ci/custom-triplets/x64-linux-dynamic.cmake new file mode 100644 index 00000000..99159007 --- /dev/null +++ b/ci/custom-triplets/x64-linux-dynamic.cmake @@ -0,0 +1,9 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_CMAKE_SYSTEM_NAME Linux) +set(VCPKG_BUILD_TYPE release) + +set(VCPKG_LIBRARY_LINKAGE static) +if(PORT MATCHES "gdal") + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() diff --git a/ci/custom-triplets/x64-osx-dynamic.cmake b/ci/custom-triplets/x64-osx-dynamic.cmake new file mode 100644 index 00000000..e1108ab4 --- /dev/null +++ b/ci/custom-triplets/x64-osx-dynamic.cmake @@ -0,0 +1,10 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_CMAKE_SYSTEM_NAME Darwin) +set(VCPKG_BUILD_TYPE release) +set(VCPKG_OSX_DEPLOYMENT_TARGET "12.0") + +set(VCPKG_LIBRARY_LINKAGE static) +if(PORT MATCHES "gdal") + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() diff --git a/ci/custom-triplets/x64-windows-dynamic-release.cmake b/ci/custom-triplets/x64-windows-dynamic-release.cmake new file mode 100644 index 00000000..f6c40253 --- /dev/null +++ b/ci/custom-triplets/x64-windows-dynamic-release.cmake @@ -0,0 +1,4 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_BUILD_TYPE release) diff --git a/ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile b/ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile index bcd8d8ef..e7110100 100644 --- a/ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile +++ b/ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile @@ -22,12 +22,10 @@ RUN bootstrap-vcpkg.sh && \ vcpkg integrate bash COPY ci/custom-triplets/x64-linux-dynamic.cmake opt/vcpkg/custom-triplets/x64-linux-dynamic.cmake -COPY ci/vcpkg-custom-ports/ opt/vcpkg/custom-ports/ COPY ci/vcpkg.json opt/vcpkg/ ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/vcpkg/installed/x64-linux-dynamic/lib" RUN vcpkg install --overlay-triplets=opt/vcpkg/custom-triplets \ - --overlay-ports=opt/vcpkg/custom-ports \ --feature-flags="versions,manifests" \ --x-manifest-root=opt/vcpkg \ --x-install-root=opt/vcpkg/installed && \