From 6e44495b2fe83d6bde89bd5bed017d5b28fa245e Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 6 Mar 2017 10:46:45 -0800 Subject: [vcpkg-configure-cmake] Centralize application of CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP --- ports/hdf5/portfile.cmake | 1 - ports/libbson/portfile.cmake | 1 - ports/mongo-c-driver/portfile.cmake | 1 - ports/mongo-cxx-driver/portfile.cmake | 1 - ports/openjpeg/portfile.cmake | 1 - ports/poco/portfile.cmake | 1 - ports/szip/portfile.cmake | 1 - 7 files changed, 7 deletions(-) diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index b2d32a322..9801ec44a 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -39,7 +39,6 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=1 -DBUILD_TESTING=OFF -DDISABLE_STATIC_LIBS=${DISABLE_STATIC_LIBS} -DHDF5_BUILD_EXAMPLES=OFF diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index ce2ccea40..6116f1f8c 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -12,7 +12,6 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS -DENABLE_TESTS=OFF - -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=ON ) vcpkg_install_cmake() diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index 3d551e084..0db81f8d3 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -20,7 +20,6 @@ vcpkg_configure_cmake( -DBSON_ROOT_DIR=${CURRENT_INSTALLED_DIR} -DENABLE_TESTS=OFF -DENABLE_EXAMPLES=OFF - -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=ON ) vcpkg_install_cmake() diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake index 4b04af054..4f3ed9dca 100644 --- a/ports/mongo-cxx-driver/portfile.cmake +++ b/ports/mongo-cxx-driver/portfile.cmake @@ -20,7 +20,6 @@ vcpkg_configure_cmake( OPTIONS -DLIBBSON_DIR=${CURRENT_INSTALLED_DIR} -DLIBMONGOC_DIR=${CURRENT_INSTALLED_DIR} - -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=ON ) vcpkg_install_cmake() diff --git a/ports/openjpeg/portfile.cmake b/ports/openjpeg/portfile.cmake index efda08313..f48395997 100644 --- a/ports/openjpeg/portfile.cmake +++ b/ports/openjpeg/portfile.cmake @@ -12,7 +12,6 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DBUILD_CODEC:BOOL=OFF -DOPENJPEG_INSTALL_PACKAGE_DIR=share/openjpeg - -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=ON ) vcpkg_install_cmake() diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake index f61ce16d9..7ef484cdb 100644 --- a/ports/poco/portfile.cmake +++ b/ports/poco/portfile.cmake @@ -30,7 +30,6 @@ vcpkg_configure_cmake( -DENABLE_SEVENZIP=ON -DENABLE_TESTS=OFF -DPOCO_UNBUNDLED=ON # OFF means: using internal copy of sqlite, libz, pcre, expat, ... - -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=ON ) vcpkg_install_cmake() diff --git a/ports/szip/portfile.cmake b/ports/szip/portfile.cmake index 0edee4dc4..957d91ea1 100644 --- a/ports/szip/portfile.cmake +++ b/ports/szip/portfile.cmake @@ -31,7 +31,6 @@ vcpkg_apply_patches( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS - -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=1 -DSZIP_INSTALL_DATA_DIR=share/szip/data -DSZIP_INSTALL_CMAKE_DIR=share/szip ) -- cgit v1.2.3