From cb16030a074783b52db91e2b990426a811ec644e Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 12 Nov 2020 22:04:04 +0100 Subject: [comms ] update to the next version (#14521) * update comms to the next version; fixed github repo * Update portfile.cmake added the no warn as error again * use only necessary boost packages as dependencies * fix formatting --- ports/comms/portfile.cmake | 6 +-- ports/comms/vcpkg.json | 2 +- ports/commsdsl/fix-cmake-cmakedir-path.patch | 13 ++++++ ports/commsdsl/fix-libxml2.patch | 64 ---------------------------- ports/commsdsl/portfile.cmake | 9 ++-- ports/commsdsl/use-FindPackage.patch | 21 --------- ports/commsdsl/vcpkg.json | 6 ++- 7 files changed, 25 insertions(+), 96 deletions(-) create mode 100644 ports/commsdsl/fix-cmake-cmakedir-path.patch delete mode 100644 ports/commsdsl/fix-libxml2.patch delete mode 100644 ports/commsdsl/use-FindPackage.patch diff --git a/ports/comms/portfile.cmake b/ports/comms/portfile.cmake index bca5f8524..6a93de71f 100644 --- a/ports/comms/portfile.cmake +++ b/ports/comms/portfile.cmake @@ -2,9 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO mathisloge/comms_champion - REF v3.1.1 - SHA512 167838aec1d42ce60e373aaa1c3b3f0093735e54b80c12229624fa5617b713462609b46585dbe9a1637404e88bd051eda2e619d21bff60056693e79dd9e53878 + REPO commschamp/comms_champion + REF v3.1.2 + SHA512 0610997fde77f3b244693a676323fbb63a411504e6cc9bd6faa03bfe7a8a17882a55c6114637d34f4dd88c55e07a1ca71b19a86042e7167ae15684c14260fa54 HEAD_REF master ) diff --git a/ports/comms/vcpkg.json b/ports/comms/vcpkg.json index 6c3668de0..f65aa56dc 100644 --- a/ports/comms/vcpkg.json +++ b/ports/comms/vcpkg.json @@ -1,6 +1,6 @@ { "name": "comms", - "version-string": "3.1.1", + "version-string": "3.1.2", "description": "COMMS is the C++(11) headers only, platform independent library, which makes the implementation of a communication protocol to be an easy and relatively quick process.", "homepage": "https://commschamp.github.io/", "documentation": "https://github.com/commschamp/comms_champion" diff --git a/ports/commsdsl/fix-cmake-cmakedir-path.patch b/ports/commsdsl/fix-cmake-cmakedir-path.patch new file mode 100644 index 000000000..bc4d5fb88 --- /dev/null +++ b/ports/commsdsl/fix-cmake-cmakedir-path.patch @@ -0,0 +1,13 @@ +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/fix-libxml2.patch b/ports/commsdsl/fix-libxml2.patch deleted file mode 100644 index 426f0ac9f..000000000 --- a/ports/commsdsl/fix-libxml2.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/lib/src/CMakeLists.txt b/lib/src/CMakeLists.txt -index 9fb4718..fec7712 100644 ---- a/lib/src/CMakeLists.txt -+++ b/lib/src/CMakeLists.txt -@@ -1,57 +1,6 @@ - set (INTERNAL_LIBXML_TGT) --while (TRUE) -- if (UNIX) -- # Use libxml2 from system repositories -- break() -- endif () -- -- if ((NOT "${LIBXML2_INCLUDE_DIR}" STREQUAL "") AND (NOT "${LIBXML2_LIBRARIES}" STREQUAL "")) -- # External build of libxml2 is provided -- break() -- endif () -- -- if (NOT MSVC) -- message (FATAL_ERROR "At this moment only MSVC compiler is supported for windows builds") -- endif () -- -- set (INTERNAL_LIBXML_TGT "libxml2_tgt") -- set (LIBXML2_DIR "${CMAKE_CURRENT_BINARY_DIR}/libxml2") -- set (LIBXML2_SRC_DIR "${LIBXML2_DIR}/src") -- set (LIBXML2_BIN_DIR "${LIBXML2_SRC_DIR}/win32") -- -- set (LIBXML2_CRUNTIME) -- if (("${CMAKE_BUILD_TYPE}" STREQUAL "") OR ("${CMAKE_BUILD_TYPE}" STREQUAL "None") OR ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")) -- set (LIBXML2_CRUNTIME "cruntime=/MDd") -- endif () -- -- include(ExternalProject) -- ExternalProject_Add( -- ${INTERNAL_LIBXML_TGT} -- PREFIX "${LIBXML2_DIR}" -- STAMP_DIR "${LIBXML2_DIR}/stamp" -- GIT_REPOSITORY "https://github.com/GNOME/libxml2.git" -- GIT_TAG "v2.9.7" -- UPDATE_DISCONNECTED 1 -- CONFIGURE_COMMAND -- cscript ${LIBXML2_BIN_DIR}/configure.js ftp=no html=no iconv=no compiler=msvc static=yes ${LIBXML2_CRUNTIME} bindir=install\\bin incdir=install\\include libdir=install\\lib sodir=install\\bin -- SOURCE_DIR "${LIBXML2_SRC_DIR}" -- BINARY_DIR "${LIBXML2_BIN_DIR}" -- BUILD_COMMAND -- nmake /f Makefile.msvc -- INSTALL_COMMAND -- nmake /f Makefile.msvc install -- ) -- -- set (LIBXML2_FOUND TRUE) -- set (LIBXML2_INCLUDE_DIR "${LIBXML2_BIN_DIR}/install/include/libxml2") -- set (LIBXML2_LIBRARIES "${LIBXML2_BIN_DIR}/install/lib/libxml2_a.lib") -- set (LIBXML2_DEFINITIONS "/DLIBXML_STATIC") -- break() --endwhile () -- --if (NOT LIBXML2_FOUND) -- find_package(LibXml2 REQUIRED) --endif () -+ -+find_package(LibXml2 REQUIRED) - - set ( - src diff --git a/ports/commsdsl/portfile.cmake b/ports/commsdsl/portfile.cmake index db5fee1c5..95ec1b4d0 100644 --- a/ports/commsdsl/portfile.cmake +++ b/ports/commsdsl/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commschamp/commsdsl - REF v3.5.2 - SHA512 cc763420e84faa7f0c6bf6c7e89e21cbf4e61eeed9916273a5117786a4d54ccc58356904266b6f8e1643fdb7715deabcea868e6a7af574a44ca0363574602aa2 + REF v3.5.3 + SHA512 f9e908f42e11e30aefe07f1b37d65545be2074758f054fb0d519e1a01f0b7060b309d2667459a5a6918a9ad9f535d0c0a0cc2cd0d4a281e78c2c48a6b8ae4a5d HEAD_REF master - PATCHES - "use-FindPackage.patch" - "fix-libxml2.patch" + PATCHES + "fix-cmake-cmakedir-path.patch" ) vcpkg_configure_cmake( diff --git a/ports/commsdsl/use-FindPackage.patch b/ports/commsdsl/use-FindPackage.patch deleted file mode 100644 index f062bf956..000000000 --- a/ports/commsdsl/use-FindPackage.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d6608b5..f545a00 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -29,14 +29,8 @@ if (NOT COMMSDSL_EXTERNALS_DIR) - set (COMMSDSL_EXTERNALS_DIR "${PROJECT_SOURCE_DIR}/externals") - endif () - --if (COMMS_INSTALL_DIR) -- set (CC_CMAKE_DIR ${COMMS_INSTALL_DIR}/lib/LibComms/cmake) --else () -- set (CC_SRC_DIR "${COMMSDSL_EXTERNALS_DIR}/comms_champion") -- include (${CMAKE_SCIPTS_DIR}/CC_Prefetch.cmake) -- cc_prefetch(SRC_DIR ${CC_SRC_DIR} TAG ${CC_TAG}) -- set (CC_CMAKE_DIR ${CC_SRC_DIR}/cmake) --endif () -+find_package(LibComms CONFIG REQUIRED) -+set(CC_CMAKE_DIR ${LibComms_DIR}) - - ################################################ - # Compiler options diff --git a/ports/commsdsl/vcpkg.json b/ports/commsdsl/vcpkg.json index a7f2e15fe..d373944b0 100644 --- a/ports/commsdsl/vcpkg.json +++ b/ports/commsdsl/vcpkg.json @@ -1,12 +1,14 @@ { "name": "commsdsl", - "version-string": "3.5.2", + "version-string": "3.5.3", "description": "DSL schemas parser and code generator for CommsChampion Ecosystem", "homepage": "https://commschamp.github.io/", "documentation": "https://github.com/commschamp/commsdsl", "supports": "!uwp", "dependencies": [ - "boost", + "boost-algorithm", + "boost-filesystem", + "boost-program-options", "comms", "libxml2" ] -- cgit v1.2.3