diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-02-01 23:38:44 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-02-01 23:38:44 -0800 |
| commit | 61e2cac730cc8b16c9373c6c463a335a21a1496a (patch) | |
| tree | 72cf2150ae87d05b6dd046506986b603ce7b3d37 /ports | |
| parent | 86f15d6daf10a4f8ba9f30083955c0ee425c4384 (diff) | |
| download | vcpkg-61e2cac730cc8b16c9373c6c463a335a21a1496a.tar.gz vcpkg-61e2cac730cc8b16c9373c6c463a335a21a1496a.zip | |
[vcpkg] improve port depend hash used in CI build
also fixed a few unstable ports that somtimes fail in CI tests
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/jsoncpp/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/ponder/portfile.cmake | 1 | ||||
| -rwxr-xr-x | ports/qt5-script/CONTROL | 1 | ||||
| -rw-r--r-- | ports/tinyspline/cmake.patch | 45 | ||||
| -rw-r--r-- | ports/xtensor-blas/portfile.cmake | 1 |
5 files changed, 20 insertions, 29 deletions
diff --git a/ports/jsoncpp/portfile.cmake b/ports/jsoncpp/portfile.cmake index c29c869ed..f1badbd1e 100644 --- a/ports/jsoncpp/portfile.cmake +++ b/ports/jsoncpp/portfile.cmake @@ -18,6 +18,7 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE OPTIONS -DJSONCPP_WITH_CMAKE_PACKAGE:BOOL=ON -DBUILD_STATIC_LIBS:BOOL=${JSONCPP_STATIC} -DBUILD_SHARED_LIBS:BOOL=${JSONCPP_DYNAMIC} diff --git a/ports/ponder/portfile.cmake b/ports/ponder/portfile.cmake index b85378ce3..8543643b5 100644 --- a/ports/ponder/portfile.cmake +++ b/ports/ponder/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
+ DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DUSES_RAPIDJSON=OFF
-DUSES_RAPIDXML=OFF
diff --git a/ports/qt5-script/CONTROL b/ports/qt5-script/CONTROL index 02a9b88fb..5dd48bac3 100755 --- a/ports/qt5-script/CONTROL +++ b/ports/qt5-script/CONTROL @@ -1,3 +1,4 @@ Source: qt5-script
Version: 5.12.0
+Build-Depends: qt5-base, qt5-modularscripts
Description:Qt5 Script Module.
diff --git a/ports/tinyspline/cmake.patch b/ports/tinyspline/cmake.patch index 2cb6a2602..593ed9012 100644 --- a/ports/tinyspline/cmake.patch +++ b/ports/tinyspline/cmake.patch @@ -1,29 +1,16 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 02dfb83..35e01f8 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -387,6 +387,9 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") - # TINYSPLINE_LIBRARY_C_FLAGS - set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /Wall") - set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /WX") -+ set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /wd4820") -+ set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /wd5045") -+ set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /wd4711") - - # TINYSPLINE_LIBRARY_CXX_FLAGS - set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /Wall") -@@ -395,6 +398,14 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") - set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4710") - set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4350") - set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4820") -+ set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd5045") -+ set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4571") -+ set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4625") -+ set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4626") -+ set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd5026") -+ set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd5027") -+ set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4774") -+ set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4711") - - # TINYSPLINE_BINDING_CXX_FLAGS - set(TINYSPLINE_BINDING_CXX_FLAGS "${TINYSPLINE_BINDING_CXX_FLAGS} /w") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 02dfb83..030a0b5 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -386,11 +386,9 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+
+ # TINYSPLINE_LIBRARY_C_FLAGS
+ set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /Wall")
+- set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /WX")
+
+ # TINYSPLINE_LIBRARY_CXX_FLAGS
+ set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /Wall")
+- set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /WX")
+ set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4514")
+ set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4710")
+ set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4350")
diff --git a/ports/xtensor-blas/portfile.cmake b/ports/xtensor-blas/portfile.cmake index ad5991af7..e9023ea15 100644 --- a/ports/xtensor-blas/portfile.cmake +++ b/ports/xtensor-blas/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
+ DISABLE_PARALLEL_CONFIGURE
OPTIONS_RELEASE -DCXXBLAS_DEBUG=OFF
OPTIONS_DEBUG -DCXXBLAS_DEBUG=ON
OPTIONS
|