From ff7113a7c6dcb38a4cbf144052b3691b348ef4da Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Tue, 24 Nov 2020 01:17:05 +0100 Subject: update to version 3.5.4 (#14691) --- ports/commsdsl/fix-cmake-cmakedir-path.patch | 13 ------------- ports/commsdsl/portfile.cmake | 9 +++------ ports/commsdsl/vcpkg.json | 3 +-- 3 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 ports/commsdsl/fix-cmake-cmakedir-path.patch diff --git a/ports/commsdsl/fix-cmake-cmakedir-path.patch b/ports/commsdsl/fix-cmake-cmakedir-path.patch deleted file mode 100644 index bc4d5fb88..000000000 --- a/ports/commsdsl/fix-cmake-cmakedir-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fb0bc2f..e94a693 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -45,7 +45,7 @@ while (TRUE) - message (FATAL_ERROR "The comms library found but the directory is not known") - endif () - -- set (CC_CMAKE_DIR ${LibComms_DIR}/lib/LibComms/cmake) -+ set (CC_CMAKE_DIR ${LibComms_DIR}) - break() - endif () - diff --git a/ports/commsdsl/portfile.cmake b/ports/commsdsl/portfile.cmake index 95ec1b4d0..c785fd80a 100644 --- a/ports/commsdsl/portfile.cmake +++ b/ports/commsdsl/portfile.cmake @@ -3,20 +3,17 @@ vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commschamp/commsdsl - REF v3.5.3 - SHA512 f9e908f42e11e30aefe07f1b37d65545be2074758f054fb0d519e1a01f0b7060b309d2667459a5a6918a9ad9f535d0c0a0cc2cd0d4a281e78c2c48a6b8ae4a5d + REF v3.5.4 + SHA512 d2bbb5332606d86200645f628507da966b385c2d8f0010e8cb83e0cdb3f3384272021db24ccb9418c69b4bd61a38edc18149cd0f7adbbbbc30168d0a15abef58 HEAD_REF master - PATCHES - "fix-cmake-cmakedir-path.patch" ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DCOMMSDSL_TEST_BUILD_CC_PLUGIN=OFF + -DCOMMSDSL_NO_COMMS_CHAMPION=ON -DCOMMSDSL_NO_TESTS=ON - -DBUILD_TESTING=OFF -DCOMMSDSL_NO_WARN_AS_ERR=ON # remove on next version or on next version of boost ) vcpkg_install_cmake() diff --git a/ports/commsdsl/vcpkg.json b/ports/commsdsl/vcpkg.json index d373944b0..9a3830be6 100644 --- a/ports/commsdsl/vcpkg.json +++ b/ports/commsdsl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "commsdsl", - "version-string": "3.5.3", + "version-string": "3.5.4", "description": "DSL schemas parser and code generator for CommsChampion Ecosystem", "homepage": "https://commschamp.github.io/", "documentation": "https://github.com/commschamp/commsdsl", @@ -9,7 +9,6 @@ "boost-algorithm", "boost-filesystem", "boost-program-options", - "comms", "libxml2" ] } -- cgit v1.2.3