From d23405ca34bafe90d98dcb2bc058f9559b303d3c Mon Sep 17 00:00:00 2001 From: LE GARREC Vincent Date: Wed, 3 Aug 2022 08:17:02 +0200 Subject: [PATCH] [mp-units] Configure only src folder (#26085) * [mp-units] Configure only src folder * [mp-units] Configure only src folder + add license --- ports/mp-units/cmake.patch | 30 ------------------------------ ports/mp-units/portfile.cmake | 3 +-- ports/mp-units/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/m-/mp-units.json | 5 +++++ 5 files changed, 9 insertions(+), 33 deletions(-) delete mode 100644 ports/mp-units/cmake.patch diff --git a/ports/mp-units/cmake.patch b/ports/mp-units/cmake.patch deleted file mode 100644 index d2d4a1a54c..0000000000 --- a/ports/mp-units/cmake.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b18a30a96..d89248aa1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -66,11 +66,21 @@ conan_init(cmake) - add_subdirectory(src) - - # add usage example --add_subdirectory(example) -+option(BUILD_EXAMPLES "Build usage examples" OFF) -+if(BUILD_EXAMPLES) -+ add_subdirectory(example) -+endif() - - # generate project documentation --add_subdirectory(docs) -+option(BUILD_DOCS "Generate docs" OFF) -+if(BUILD_DOCS) -+ add_subdirectory(docs) -+endif() - - # add unit tests --enable_testing() --add_subdirectory(test) -+option(BUILD_TESTING "Build tests" OFF) -+if(BUILD_TESTING) -+ set_warnings(mp-units) -+ enable_testing() -+ add_subdirectory(test) -+endif() diff --git a/ports/mp-units/portfile.cmake b/ports/mp-units/portfile.cmake index f608f1af1e..04236589db 100644 --- a/ports/mp-units/portfile.cmake +++ b/ports/mp-units/portfile.cmake @@ -4,12 +4,11 @@ vcpkg_from_github( REF v0.7.0 SHA512 72175f34f358d0741650ce9c8a7b28fced90cc45ddd3f1662ae1cb9ff7d31403ff742ee07ab4c96bd2d95af714d9111a888cf6acccb91e568e12d1ef663b2f64 PATCHES - cmake.patch config.patch ) vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" + SOURCE_PATH "${SOURCE_PATH}/src" ) vcpkg_cmake_install() diff --git a/ports/mp-units/vcpkg.json b/ports/mp-units/vcpkg.json index e4cc95da2e..7454612bcd 100644 --- a/ports/mp-units/vcpkg.json +++ b/ports/mp-units/vcpkg.json @@ -1,8 +1,10 @@ { "name": "mp-units", "version-semver": "0.7.0", + "port-version": 1, "description": "mp-units - A Units Library for C++", "homepage": "https://github.com/mpusz/units", + "license": "MIT", "dependencies": [ "fmt", "gsl-lite", diff --git a/versions/baseline.json b/versions/baseline.json index 9f359145f4..a9932b8baa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4710,7 +4710,7 @@ }, "mp-units": { "baseline": "0.7.0", - "port-version": 0 + "port-version": 1 }, "mp3lame": { "baseline": "3.100", diff --git a/versions/m-/mp-units.json b/versions/m-/mp-units.json index a8e54c22c1..ef5ebfecc2 100644 --- a/versions/m-/mp-units.json +++ b/versions/m-/mp-units.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4bce95b7e67f66db9d613e7e3601c2b90cec665", + "version-semver": "0.7.0", + "port-version": 1 + }, { "git-tree": "ed05b65c897d6508b0b5f88f8a97373cf8fd8715", "version-semver": "0.7.0",