diff options
| -rw-r--r-- | ports/anax/CONTROL | 2 | ||||
| -rw-r--r-- | ports/anax/portfile.cmake | 18 | ||||
| -rw-r--r-- | ports/glew/CONTROL | 2 | ||||
| -rw-r--r-- | ports/glew/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/octomap/CONTROL | 2 | ||||
| -rw-r--r-- | ports/octomap/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/roaring/CONTROL | 2 | ||||
| -rw-r--r-- | ports/roaring/portfile.cmake | 1 |
8 files changed, 11 insertions, 18 deletions
diff --git a/ports/anax/CONTROL b/ports/anax/CONTROL index 12be38d11..459692ac5 100644 --- a/ports/anax/CONTROL +++ b/ports/anax/CONTROL @@ -1,3 +1,3 @@ Source: anax -Version: 2.1.0-3 +Version: 2.1.0-4 Description: An open source C++ entity system. <https://github.com/miguelmartin75/anax> diff --git a/ports/anax/portfile.cmake b/ports/anax/portfile.cmake index 8881957fc..49fbb372d 100644 --- a/ports/anax/portfile.cmake +++ b/ports/anax/portfile.cmake @@ -1,11 +1,3 @@ -# Common Ambient Variables: -# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg> -# TARGET_TRIPLET is the current triplet (x86-windows, etc) -# PORT is the current port name (zlib, etc) -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# - include(vcpkg_common_functions) vcpkg_from_github( @@ -14,17 +6,15 @@ vcpkg_from_github( REF v2.1.0 SHA512 b573733b5f9634bf8cfc5b0715074f9a8ee29ecb48dc981d9371254a1f6ff8afbbb9ba6aa0877d53e518e5486ecc398a6d331fb9b5dbfd17d8707679216e11a3 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/Add-bin-output.patch + PATCHES + Add-bin-output.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE OPTIONS - -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON + -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON ) vcpkg_install_cmake() diff --git a/ports/glew/CONTROL b/ports/glew/CONTROL index 45af04091..54b2d09df 100644 --- a/ports/glew/CONTROL +++ b/ports/glew/CONTROL @@ -1,3 +1,3 @@ Source: glew
-Version: 2.1.0-2
+Version: 2.1.0-3
Description: The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.
diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index 1e2080458..9b982db7f 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_extract_source_archive(${ARCHIVE_FILE} ${CURRENT_BUILDTREES_DIR}/src/glew) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/build/cmake + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_UTILS=OFF ) diff --git a/ports/octomap/CONTROL b/ports/octomap/CONTROL index f6633ea07..71e76163a 100644 --- a/ports/octomap/CONTROL +++ b/ports/octomap/CONTROL @@ -1,3 +1,3 @@ Source: octomap -Version: cefed0c1d79afafa5aeb05273cf1246b093b771c-4 +Version: cefed0c1d79afafa5aeb05273cf1246b093b771c-5 Description: An Efficient Probabilistic 3D Mapping Framework Based on Octrees diff --git a/ports/octomap/portfile.cmake b/ports/octomap/portfile.cmake index 5155c31bb..98630922e 100644 --- a/ports/octomap/portfile.cmake +++ b/ports/octomap/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_OCTOVIS_SUBPROJECT=OFF -DBUILD_DYNAMICETD3D_SUBPROJECT=OFF diff --git a/ports/roaring/CONTROL b/ports/roaring/CONTROL index 7b5b05949..0b1327da4 100644 --- a/ports/roaring/CONTROL +++ b/ports/roaring/CONTROL @@ -1,3 +1,3 @@ Source: roaring
-Version: 2019-03-05-1
+Version: 2019-03-05-2
Description: A better compressed bitset in C (and C++)
diff --git a/ports/roaring/portfile.cmake b/ports/roaring/portfile.cmake index 8748c4e57..937fd0751 100644 --- a/ports/roaring/portfile.cmake +++ b/ports/roaring/portfile.cmake @@ -17,6 +17,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ROARING_BUILD_STATIC) vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
+ DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DROARING_BUILD_STATIC=${ROARING_BUILD_STATIC}
-DENABLE_ROARING_TESTS=OFF
|