aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwangli28 <47812810+wangli28@users.noreply.github.com>2019-05-17 23:10:31 +0000
committerVictor Romero <romerosanchezv@gmail.com>2019-05-17 16:10:31 -0700
commite54af5898622af1cf2fa0b54a2d870800c2a97df (patch)
treeb8710a5106d00be528efb20772b9af701e1c61e8
parent2e51afcd65d49504cc75d6bf3e6c58bac749da60 (diff)
downloadvcpkg-e54af5898622af1cf2fa0b54a2d870800c2a97df.tar.gz
vcpkg-e54af5898622af1cf2fa0b54a2d870800c2a97df.zip
[many ports]Remove double builds (#6472)
-rw-r--r--ports/clockutils/CONTROL2
-rw-r--r--ports/clockutils/portfile.cmake1
-rw-r--r--ports/freerdp/CONTROL2
-rw-r--r--ports/freerdp/portfile.cmake1
-rw-r--r--ports/fuzzylite/CONTROL2
-rw-r--r--ports/fuzzylite/portfile.cmake1
-rw-r--r--ports/jbigkit/CONTROL2
-rw-r--r--ports/jbigkit/portfile.cmake1
-rw-r--r--ports/libgd/CONTROL2
-rw-r--r--ports/libgd/portfile.cmake1
-rw-r--r--ports/libodb-boost/CONTROL2
-rw-r--r--ports/libodb-boost/portfile.cmake2
-rw-r--r--ports/libodb-pgsql/CONTROL2
-rw-r--r--ports/libodb-pgsql/portfile.cmake2
-rw-r--r--ports/libodb-sqlite/CONTROL2
-rw-r--r--ports/libodb-sqlite/portfile.cmake2
-rw-r--r--ports/libodb/CONTROL2
-rw-r--r--ports/libodb/portfile.cmake2
-rw-r--r--ports/libp7-baical/CONTROL2
-rw-r--r--ports/libp7-baical/portfile.cmake1
-rw-r--r--ports/libusb-win32/CONTROL2
-rw-r--r--ports/libusb-win32/portfile.cmake1
22 files changed, 15 insertions, 22 deletions
diff --git a/ports/clockutils/CONTROL b/ports/clockutils/CONTROL
index 5a3325350..37c5ec8ca 100644
--- a/ports/clockutils/CONTROL
+++ b/ports/clockutils/CONTROL
@@ -1,3 +1,3 @@
Source: clockutils
-Version: 1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-2
+Version: 1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-3
Description: A lightweight c++ library for commonly needed tasks. Optimized for simplicity and speed.
diff --git a/ports/clockutils/portfile.cmake b/ports/clockutils/portfile.cmake
index 28a1de440..7511158de 100644
--- a/ports/clockutils/portfile.cmake
+++ b/ports/clockutils/portfile.cmake
@@ -28,7 +28,6 @@ vcpkg_configure_cmake(
-DCLOCKUTILS_BUILD_SHARED=${SHARED_FLAG}
)
-vcpkg_build_cmake()
vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
diff --git a/ports/freerdp/CONTROL b/ports/freerdp/CONTROL
index 6a2d5d480..8ea98ed6d 100644
--- a/ports/freerdp/CONTROL
+++ b/ports/freerdp/CONTROL
@@ -1,4 +1,4 @@
Source: freerdp
-Version: 2.0.0-rc1~vcpkg1
+Version: 2.0.0-rc1~vcpkg1-1
Description: A free implementation of the Remote Desktop Protocol (RDP)
Build-Depends: openssl
diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake
index cd27da88c..6ec7c9ac1 100644
--- a/ports/freerdp/portfile.cmake
+++ b/ports/freerdp/portfile.cmake
@@ -32,7 +32,6 @@ vcpkg_configure_cmake(
OPTIONS -DGIT_REVISION=${FREERDP_VERSION}
${FREERDP_CRT_LINKAGE})
-vcpkg_build_cmake()
vcpkg_install_cmake()
vcpkg_copy_pdbs()
diff --git a/ports/fuzzylite/CONTROL b/ports/fuzzylite/CONTROL
index 422a8af2e..b6faaa30f 100644
--- a/ports/fuzzylite/CONTROL
+++ b/ports/fuzzylite/CONTROL
@@ -1,3 +1,3 @@
Source: fuzzylite
-Version: 6.0-1
+Version: 6.0-2
Description: A fuzzy logic control library in C++
diff --git a/ports/fuzzylite/portfile.cmake b/ports/fuzzylite/portfile.cmake
index 976ca66de..c4b70a72f 100644
--- a/ports/fuzzylite/portfile.cmake
+++ b/ports/fuzzylite/portfile.cmake
@@ -30,7 +30,6 @@ vcpkg_configure_cmake(
-DFL_BUILD_TESTS=OFF
)
-vcpkg_build_cmake()
vcpkg_install_cmake()
vcpkg_copy_pdbs()
diff --git a/ports/jbigkit/CONTROL b/ports/jbigkit/CONTROL
index f6c5e65ca..f21907db4 100644
--- a/ports/jbigkit/CONTROL
+++ b/ports/jbigkit/CONTROL
@@ -1,3 +1,3 @@
Source: jbigkit
-Version: 2.1-2
+Version: 2.1-3
Description: A software implementation of the JBIG1 data compression standard (ITU-T T.82)
diff --git a/ports/jbigkit/portfile.cmake b/ports/jbigkit/portfile.cmake
index 16b37eb29..9e63a426f 100644
--- a/ports/jbigkit/portfile.cmake
+++ b/ports/jbigkit/portfile.cmake
@@ -19,7 +19,6 @@ vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA)
-vcpkg_build_cmake()
vcpkg_install_cmake()
vcpkg_copy_pdbs()
diff --git a/ports/libgd/CONTROL b/ports/libgd/CONTROL
index 55ab7ccdc..56f297798 100644
--- a/ports/libgd/CONTROL
+++ b/ports/libgd/CONTROL
@@ -1,5 +1,5 @@
Source: libgd
-Version: 2.2.5-2
+Version: 2.2.5-3
Description: Open source code library for the dynamic creation of images by programmers.
Default-Features: fontconfig, freetype, jpeg, png, tiff, webp
diff --git a/ports/libgd/portfile.cmake b/ports/libgd/portfile.cmake
index 06529f4a2..6ef2127d5 100644
--- a/ports/libgd/portfile.cmake
+++ b/ports/libgd/portfile.cmake
@@ -68,7 +68,6 @@ vcpkg_configure_cmake(
-DBUILD_STATIC_LIBS=${LIBGD_STATIC_LIBS}
)
-vcpkg_build_cmake()
vcpkg_install_cmake()
vcpkg_copy_pdbs()
diff --git a/ports/libodb-boost/CONTROL b/ports/libodb-boost/CONTROL
index 5913d752b..24f7d18b9 100644
--- a/ports/libodb-boost/CONTROL
+++ b/ports/libodb-boost/CONTROL
@@ -1,4 +1,4 @@
Source: libodb-boost
-Version: 2.4.0-1
+Version: 2.4.0-2
Description: Description: Boost support for the ODB ORM library
Build-Depends: libodb
diff --git a/ports/libodb-boost/portfile.cmake b/ports/libodb-boost/portfile.cmake
index 3f8dfc061..212e6b01a 100644
--- a/ports/libodb-boost/portfile.cmake
+++ b/ports/libodb-boost/portfile.cmake
@@ -17,7 +17,7 @@ vcpkg_configure_cmake(
OPTIONS_DEBUG
-DLIBODB_INSTALL_HEADERS=OFF
)
-vcpkg_build_cmake()
+
vcpkg_install_cmake()
file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_boostConfig-debug.cmake LIBODB_DEBUG_TARGETS)
diff --git a/ports/libodb-pgsql/CONTROL b/ports/libodb-pgsql/CONTROL
index f89d1f37c..d6be72f08 100644
--- a/ports/libodb-pgsql/CONTROL
+++ b/ports/libodb-pgsql/CONTROL
@@ -1,4 +1,4 @@
Source: libodb-pgsql
-Version: 2.4.0-1
+Version: 2.4.0-2
Description: Description: PostgreSQL support for the ODB ORM library
Build-Depends: libodb, libpq
diff --git a/ports/libodb-pgsql/portfile.cmake b/ports/libodb-pgsql/portfile.cmake
index cef945c73..3e31f2aa7 100644
--- a/ports/libodb-pgsql/portfile.cmake
+++ b/ports/libodb-pgsql/portfile.cmake
@@ -17,7 +17,7 @@ vcpkg_configure_cmake(
OPTIONS_DEBUG
-DLIBODB_INSTALL_HEADERS=OFF
)
-vcpkg_build_cmake()
+
vcpkg_install_cmake()
file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_pgsqlConfig-debug.cmake LIBODB_DEBUG_TARGETS)
diff --git a/ports/libodb-sqlite/CONTROL b/ports/libodb-sqlite/CONTROL
index 6a98869bd..e523de989 100644
--- a/ports/libodb-sqlite/CONTROL
+++ b/ports/libodb-sqlite/CONTROL
@@ -1,4 +1,4 @@
Source: libodb-sqlite
-Version: 2.4.0-2
+Version: 2.4.0-3
Description: Sqlite support for the ODB ORM library
Build-Depends: libodb, sqlite3
diff --git a/ports/libodb-sqlite/portfile.cmake b/ports/libodb-sqlite/portfile.cmake
index 143d32efb..b301169a7 100644
--- a/ports/libodb-sqlite/portfile.cmake
+++ b/ports/libodb-sqlite/portfile.cmake
@@ -25,7 +25,7 @@ vcpkg_configure_cmake(
OPTIONS_DEBUG
-DLIBODB_INSTALL_HEADERS=OFF
)
-vcpkg_build_cmake()
+
vcpkg_install_cmake()
file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_sqliteConfig-debug.cmake LIBODB_DEBUG_TARGETS)
diff --git a/ports/libodb/CONTROL b/ports/libodb/CONTROL
index 28a9f85f4..9e963c89b 100644
--- a/ports/libodb/CONTROL
+++ b/ports/libodb/CONTROL
@@ -1,3 +1,3 @@
Source: libodb
-Version: 2.4.0-3
+Version: 2.4.0-4
Description: ODB library, base runtime for the ODB ORM solution
diff --git a/ports/libodb/portfile.cmake b/ports/libodb/portfile.cmake
index 017979dc4..1ca5d4a1a 100644
--- a/ports/libodb/portfile.cmake
+++ b/ports/libodb/portfile.cmake
@@ -25,7 +25,7 @@ vcpkg_configure_cmake(
OPTIONS_DEBUG
-DLIBODB_INSTALL_HEADERS=OFF
)
-vcpkg_build_cmake()
+
vcpkg_install_cmake()
file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_libodbConfig-debug.cmake LIBODB_DEBUG_TARGETS)
string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}")
diff --git a/ports/libp7-baical/CONTROL b/ports/libp7-baical/CONTROL
index ea1739798..8369b65f4 100644
--- a/ports/libp7-baical/CONTROL
+++ b/ports/libp7-baical/CONTROL
@@ -1,3 +1,3 @@
Source: libp7-baical
-Version: 4.4-3
+Version: 4.4-4
Description: P7 is a library for high-speed sending telemetry & trace data from application
diff --git a/ports/libp7-baical/portfile.cmake b/ports/libp7-baical/portfile.cmake
index 3edc89c47..fcc51caed 100644
--- a/ports/libp7-baical/portfile.cmake
+++ b/ports/libp7-baical/portfile.cmake
@@ -26,7 +26,6 @@ vcpkg_configure_cmake(
PREFER_NINJA
)
-vcpkg_build_cmake()
vcpkg_install_cmake()
vcpkg_copy_pdbs()
diff --git a/ports/libusb-win32/CONTROL b/ports/libusb-win32/CONTROL
index eba6e283d..17a571287 100644
--- a/ports/libusb-win32/CONTROL
+++ b/ports/libusb-win32/CONTROL
@@ -1,3 +1,3 @@
Source: libusb-win32
-Version: 1.2.6.0-1
+Version: 1.2.6.0-2
Description: Allows user space applications to access many USB device on Windows.
diff --git a/ports/libusb-win32/portfile.cmake b/ports/libusb-win32/portfile.cmake
index a93b39bca..df12a9179 100644
--- a/ports/libusb-win32/portfile.cmake
+++ b/ports/libusb-win32/portfile.cmake
@@ -21,7 +21,6 @@ vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA)
-vcpkg_build_cmake()
vcpkg_install_cmake()
vcpkg_copy_pdbs()