From fda667e21035cd71564e9d7c39075da3dff3710b Mon Sep 17 00:00:00 2001 From: Kaung Zaw Htet Date: Fri, 16 Oct 2020 05:22:24 +0630 Subject: [PATCH 01/20] [oatpp] Update to 1.2.0 --- ports/oatpp-consul/CONTROL | 2 +- ports/oatpp-consul/portfile.cmake | 6 +++--- ports/oatpp-curl/CONTROL | 2 +- ports/oatpp-curl/portfile.cmake | 6 +++--- ports/oatpp-libressl/CONTROL | 2 +- ports/oatpp-libressl/portfile.cmake | 4 ++-- ports/oatpp-mbedtls/CONTROL | 2 +- ports/oatpp-mbedtls/portfile.cmake | 6 +++--- ports/oatpp-swagger/CONTROL | 2 +- ports/oatpp-swagger/portfile.cmake | 6 +++--- ports/oatpp-websocket/CONTROL | 2 +- ports/oatpp-websocket/portfile.cmake | 6 +++--- ports/oatpp/CONTROL | 2 +- ports/oatpp/portfile.cmake | 6 +++--- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/ports/oatpp-consul/CONTROL b/ports/oatpp-consul/CONTROL index 468f48f30d820a..d24cb76253ebe7 100644 --- a/ports/oatpp-consul/CONTROL +++ b/ports/oatpp-consul/CONTROL @@ -1,5 +1,5 @@ Source: oatpp-consul -Version: 1.1.0 +Version: 1.2.0 Description: OAT++ Modern web framework consul module Build-Depends: oatpp Homepage: https://github.com/oatpp/oatpp-consul diff --git a/ports/oatpp-consul/portfile.cmake b/ports/oatpp-consul/portfile.cmake index 8c61812e4d36d7..ce2670be44cf2d 100644 --- a/ports/oatpp-consul/portfile.cmake +++ b/ports/oatpp-consul/portfile.cmake @@ -1,12 +1,12 @@ -set(OATPP_VERSION "1.1.0") +set(OATPP_VERSION "1.2.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-consul - REF e8da386f8f21bc416329aa1f72507ba710ac8d94 # 1.1.0 - SHA512 69d159a8fb3887fdc0654598d14b3320d04bb91baff7113f7cf95394f28e29a3e78014c42d135825c17ecbaab456784b36983527161f8f694ee8b6f62aefee4e + REF c54ad810f245681dc25ba5e0ec48f19e7c85e1bd # 1.2.0 + SHA512 5cf886b52af915bda0728ae9721adb155b5147c5b428ff02f5cbe932038d43e75fe5a221b16e3103ecffaed5fcdf39bf0e13157f79d8d4f2d7c74532b70566a2 HEAD_REF master ) diff --git a/ports/oatpp-curl/CONTROL b/ports/oatpp-curl/CONTROL index 974c5e92b67e3e..661d8877e2c614 100644 --- a/ports/oatpp-curl/CONTROL +++ b/ports/oatpp-curl/CONTROL @@ -1,5 +1,5 @@ Source: oatpp-curl -Version: 1.1.0 +Version: 1.2.0 Description: Oat++ Modern web framework curl module to use libcurl as a RequestExecutor on the oatpp's ApiClient Build-Depends: curl,oatpp Homepage: https://github.com/oatpp/oatpp-curl diff --git a/ports/oatpp-curl/portfile.cmake b/ports/oatpp-curl/portfile.cmake index d5187190e69ae0..1b02b458d2faf3 100644 --- a/ports/oatpp-curl/portfile.cmake +++ b/ports/oatpp-curl/portfile.cmake @@ -1,12 +1,12 @@ -set(OATPP_VERSION "1.1.0") +set(OATPP_VERSION "1.2.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-curl - REF 7cf7a5acf7e79612598f38f4d7966ddbe498b846 # 1.1.0 - SHA512 77f02e53c4a2d28c689169b1d0aad9f8e7f28c03c31e0512624cd51a6f2ddd3f863a6a48631fc560311015108263bcd31d6e1a7e092e8c45595ea50b00d51df3 + REF b7c0507e286fbc55ccbbb4a2604f6c46d3a86525 # 1.2.0 + SHA512 274aaf34733ab70b148182332db493157ed8c87e093d09bf7dcbd9c89034dab9a97f05ba0887459a8a0ed80b2c2248c253b1ff8c933e196a6ecee11546a4488b HEAD_REF master PATCHES "curl-submodule-no-pkg-config-in-vcpkg.patch" ) diff --git a/ports/oatpp-libressl/CONTROL b/ports/oatpp-libressl/CONTROL index fc95db3d4978f3..b9ecc1f56631e4 100644 --- a/ports/oatpp-libressl/CONTROL +++ b/ports/oatpp-libressl/CONTROL @@ -1,5 +1,5 @@ Source: oatpp-libressl -Version: 1.1.0 +Version: 1.2.0 Build-Depends: libressl, oatpp Description: Oat++ libressl module providing secure server and client connection providers Homepage: https://github.com/oatpp/oatpp-libressl diff --git a/ports/oatpp-libressl/portfile.cmake b/ports/oatpp-libressl/portfile.cmake index f453507f7420ab..7575ced1030579 100644 --- a/ports/oatpp-libressl/portfile.cmake +++ b/ports/oatpp-libressl/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.1.0") +set(OATPP_VERSION "1.2.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,7 +6,7 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-libressl - REF 8a7f0f4449b9dbf63fb60fb892bd16a2f5fb0fab # 1.1.0 + REF cd2e9a515131e5e7dc043c591e952e12cd63db2c # 1.2.0 SHA512 f6400e3d3976de1ab0d220f4c7bd84cbeafa6263671511a7ac113f855ad6a63470cab0571320d37ccd55a768ef9f3ca61adfa9066aadfd61bd00f5020c90777c HEAD_REF master PATCHES "libress-submodule-downgrade-required-libressl-version.patch" diff --git a/ports/oatpp-mbedtls/CONTROL b/ports/oatpp-mbedtls/CONTROL index e1bacf1c2498ca..3554f89bdf426a 100644 --- a/ports/oatpp-mbedtls/CONTROL +++ b/ports/oatpp-mbedtls/CONTROL @@ -1,5 +1,5 @@ Source: oatpp-mbedtls -Version: 1.1.0 +Version: 1.2.0 Build-Depends: mbedtls, oatpp Description: Oat++ Mbed TLS submodule providing secure server and client connection providers Homepage: https://github.com/oatpp/oatpp-mbedtls diff --git a/ports/oatpp-mbedtls/portfile.cmake b/ports/oatpp-mbedtls/portfile.cmake index 82eea23174a5a0..3076b4e300fc5e 100644 --- a/ports/oatpp-mbedtls/portfile.cmake +++ b/ports/oatpp-mbedtls/portfile.cmake @@ -1,12 +1,12 @@ -set(OATPP_VERSION "1.1.0") +set(OATPP_VERSION "1.2.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-mbedtls - REF 847b9562ddcd40f1d2b340177028b3519fb1f58a # 1.1.0 - SHA512 70559a33fb7a827714c353b158af8ef90fc5cd792e7f59bcf833ebd203874370e6f8f5b7a531497ea44d406cc515c42bfbef8d4f98e5e8074a141ba2ba78890b + REF b415a88d652cbb1f1cbbd9093345c961cbac4ec1 # 1.2.0 + SHA512 08864932b20bc9c569eed052137d0eacafb2acd975d0ebacaa7430ae23a6e9ef7c4afb45d88178531a1f0af1a1d488087e9bc26a866f9a656c695d55b0c85ad3 HEAD_REF master PATCHES find-mbedtls.patch ) diff --git a/ports/oatpp-swagger/CONTROL b/ports/oatpp-swagger/CONTROL index d45a5e7de9bc19..d6d8889e55c592 100644 --- a/ports/oatpp-swagger/CONTROL +++ b/ports/oatpp-swagger/CONTROL @@ -1,5 +1,5 @@ Source: oatpp-swagger -Version: 1.1.0 +Version: 1.2.0 Description: Oat++ OpenApi (Swagger) UI submodule Build-Depends: oatpp Homepage: https://github.com/oatpp/oatpp-swagger diff --git a/ports/oatpp-swagger/portfile.cmake b/ports/oatpp-swagger/portfile.cmake index c8773b64392b64..00a538a018a9b0 100644 --- a/ports/oatpp-swagger/portfile.cmake +++ b/ports/oatpp-swagger/portfile.cmake @@ -1,12 +1,12 @@ -set(OATPP_VERSION "1.1.0") +set(OATPP_VERSION "1.2.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-swagger - REF 7aa5ecb07bfbf9931aa7906247d8c8f59f35a4b4 # 1.1.0 - SHA512 df1f61e69ad2a7a533bc2b2a78342edb6954ba77980cf941d22f09e86d2fe85073863061aec44ccd80f15b8ea70d5fc70024c806f85cddc6790331ee718ad8bc + REF d0495421914cc2f9ed0a4c625d215c3d140a339f # 1.2.0 + SHA512 d6e7e495c5a9c8cefc8703758cbbd69767373edccaf8040963e950a033525af0491c950f5fa85b7fea03b0a2901d295368a2d67f9d7069f1bad856c8c1652bd4 HEAD_REF master ) diff --git a/ports/oatpp-websocket/CONTROL b/ports/oatpp-websocket/CONTROL index cf6ca6c18f8aa4..7d915ed0be4a47 100644 --- a/ports/oatpp-websocket/CONTROL +++ b/ports/oatpp-websocket/CONTROL @@ -1,5 +1,5 @@ Source: oatpp-websocket -Version: 1.1.0 +Version: 1.2.0 Description: Oat++ websocket module Build-Depends: oatpp Homepage: https://github.com/oatpp/oatpp-websocket diff --git a/ports/oatpp-websocket/portfile.cmake b/ports/oatpp-websocket/portfile.cmake index 51181527658b1f..4c349614700c85 100644 --- a/ports/oatpp-websocket/portfile.cmake +++ b/ports/oatpp-websocket/portfile.cmake @@ -1,12 +1,12 @@ -set(OATPP_VERSION "1.1.0") +set(OATPP_VERSION "1.2.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-websocket - REF 41a0480fdd4cf8a076c9fbd79959be1156ecb204 # 1.1.0 - SHA512 7237e6d94ebc4873ee9a3350b01f2a841f419dc8fbc917a51aebd2dcd89927e1a58816dc83040bb7da1cee36d81aba6cf17833c58831c8693fd1454021610908 + REF 1ac81a1ae2588e9b21e4b9ecb93f7f30739fdcfe # 1.2.0 + SHA512 db70052f4399300e2fd75f6dc7fb85b3084cc7ad4fba09340707c8465cfa3ea7f63f629581722912009d450d7951c0e0b04ffec9c24fa4dcdf0aaf429cff5593 HEAD_REF master ) diff --git a/ports/oatpp/CONTROL b/ports/oatpp/CONTROL index 7b100d4cd1b609..45de646a59d5b9 100644 --- a/ports/oatpp/CONTROL +++ b/ports/oatpp/CONTROL @@ -1,4 +1,4 @@ Source: oatpp -Version: 1.1.0 +Version: 1.2.0 Description: Modern web framework Homepage: https://github.com/oatpp/oatpp diff --git a/ports/oatpp/portfile.cmake b/ports/oatpp/portfile.cmake index 4b870197a86a9c..9e93d42bacd4b3 100644 --- a/ports/oatpp/portfile.cmake +++ b/ports/oatpp/portfile.cmake @@ -1,12 +1,12 @@ -set(OATPP_VERSION "1.1.0") +set(OATPP_VERSION "1.2.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp - REF 4427123bb3608a78806ebce654cfe74605a389bf # 1.0.0 - SHA512 91f3b66d573b918836bb2190fbaa5579da0f5b93b4905ed44ec63db2e947c64fa1be00f14f4ce85ff1103ab59f79506abf6dfbfe7edf7176f2365613e7aef825 + REF 28b1dd934e9f98e969b96d9ef2dd4f0c218c9c08 # 1.2.0 + SHA512 bad95e80d43b452c5091ccf468f4d3498afbca7ff660b04a3e0aec1583edb84009070fb83338525babbb14a7eb139d8fcc2d1d87b331935e2a9bfd78f0fdb7ed HEAD_REF master ) From 718c980fba3648081bdcf655553ce141ebf29602 Mon Sep 17 00:00:00 2001 From: Kaung Zaw Htet Date: Fri, 16 Oct 2020 11:46:06 +0630 Subject: [PATCH 02/20] fixed UWP build err of oatpp at v1.2.0 --- ports/oatpp/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/oatpp/portfile.cmake b/ports/oatpp/portfile.cmake index 9e93d42bacd4b3..82c72d27308fd2 100644 --- a/ports/oatpp/portfile.cmake +++ b/ports/oatpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp - REF 28b1dd934e9f98e969b96d9ef2dd4f0c218c9c08 # 1.2.0 - SHA512 bad95e80d43b452c5091ccf468f4d3498afbca7ff660b04a3e0aec1583edb84009070fb83338525babbb14a7eb139d8fcc2d1d87b331935e2a9bfd78f0fdb7ed + REF 2d8711307e23e9f022cbe2758c07ce4e44e8d31f # 1.2.0 + SHA512 ae99467034360a4eb20a8a49e8ccd5e39ed9d71f9cd07d5b9bf2be0db7a7bff65415b0086de4ae267701c09f7b48fdf5d4d8ccb22f05fd41805232894b39b06c HEAD_REF master ) From 8ede7c834a70b6649d3ece3dfb34f6f5adb1e343 Mon Sep 17 00:00:00 2001 From: Kaung Zaw Htet Date: Mon, 19 Oct 2020 09:57:30 +0630 Subject: [PATCH 03/20] [oatpp-sqlite] port added --- ports/oatpp-sqlite/CONTROL | 5 +++++ ports/oatpp-sqlite/portfile.cmake | 32 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 ports/oatpp-sqlite/CONTROL create mode 100644 ports/oatpp-sqlite/portfile.cmake diff --git a/ports/oatpp-sqlite/CONTROL b/ports/oatpp-sqlite/CONTROL new file mode 100644 index 00000000000000..abc77a32ff2958 --- /dev/null +++ b/ports/oatpp-sqlite/CONTROL @@ -0,0 +1,5 @@ +Source: oatpp-sqlite +Version: 1.2.0 +Description: OAT++ Modern web framework sqlite module +Build-Depends: oatpp +Homepage: https://github.com/oatpp/oatpp-sqlite diff --git a/ports/oatpp-sqlite/portfile.cmake b/ports/oatpp-sqlite/portfile.cmake new file mode 100644 index 00000000000000..667a7c5023db0a --- /dev/null +++ b/ports/oatpp-sqlite/portfile.cmake @@ -0,0 +1,32 @@ +set(OATPP_VERSION "1.2.0") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oatpp/oatpp-sqlite + REF 932a79f1db5a0dfd6955c8fd84dc7bd2e5962be1 # 1.2.0 + SHA512 12004d9339d6debc86513f78d17f9a41bf29a60d41c084e0698044b49c549b10bd3ddea35a6b2eabf8de06da54394695797bb7972888f57fc2938f1596fe03a0 + HEAD_REF master +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "ON") +else() + set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "OFF") +endif() + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS + "-DOATPP_BUILD_TESTS:BOOL=OFF" + "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" + "-DBUILD_SHARED_LIBS:BOOL=${OATPP_BUILD_SHARED_LIBRARIES_OPTION}" +) +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-sqlite-${OATPP_VERSION}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 16951b54ff83657ad404c56196b6e461ff8f08a2 Mon Sep 17 00:00:00 2001 From: Kaung Zaw Htet Date: Sun, 25 Oct 2020 19:09:58 +0630 Subject: [PATCH 04/20] fixed oatpp-sqlite & removed all of lib type config --- ports/oatpp-consul/portfile.cmake | 8 ++------ ports/oatpp-curl/portfile.cmake | 8 ++------ ports/oatpp-libressl/portfile.cmake | 8 ++------ ports/oatpp-mbedtls/portfile.cmake | 8 ++------ ports/oatpp-sqlite/portfile.cmake | 11 +++-------- ports/oatpp-swagger/portfile.cmake | 8 ++------ ports/oatpp-websocket/portfile.cmake | 8 ++------ ports/oatpp/portfile.cmake | 7 +------ 8 files changed, 16 insertions(+), 50 deletions(-) diff --git a/ports/oatpp-consul/portfile.cmake b/ports/oatpp-consul/portfile.cmake index ce2670be44cf2d..53d3363760fd0c 100644 --- a/ports/oatpp-consul/portfile.cmake +++ b/ports/oatpp-consul/portfile.cmake @@ -10,11 +10,7 @@ vcpkg_from_github( HEAD_REF master ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "ON") -else() - set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "OFF") -endif() + vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}" @@ -22,7 +18,7 @@ vcpkg_configure_cmake( OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" - "-DBUILD_SHARED_LIBS:BOOL=${OATPP_BUILD_SHARED_LIBRARIES_OPTION}" + ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-consul-${OATPP_VERSION}) diff --git a/ports/oatpp-curl/portfile.cmake b/ports/oatpp-curl/portfile.cmake index 1b02b458d2faf3..fd326570bd8cf6 100644 --- a/ports/oatpp-curl/portfile.cmake +++ b/ports/oatpp-curl/portfile.cmake @@ -11,11 +11,7 @@ vcpkg_from_github( PATCHES "curl-submodule-no-pkg-config-in-vcpkg.patch" ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "ON") -else() - set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "OFF") -endif() + vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}" @@ -23,7 +19,7 @@ vcpkg_configure_cmake( OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" - "-DBUILD_SHARED_LIBS:BOOL=${OATPP_BUILD_SHARED_LIBRARIES_OPTION}" + ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-curl-${OATPP_VERSION}) diff --git a/ports/oatpp-libressl/portfile.cmake b/ports/oatpp-libressl/portfile.cmake index 7575ced1030579..83aa24518bbd37 100644 --- a/ports/oatpp-libressl/portfile.cmake +++ b/ports/oatpp-libressl/portfile.cmake @@ -12,11 +12,7 @@ vcpkg_from_github( PATCHES "libress-submodule-downgrade-required-libressl-version.patch" ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "ON") -else() - set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "OFF") -endif() + vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}" @@ -25,7 +21,7 @@ vcpkg_configure_cmake( "-DOATPP_BUILD_TESTS:BOOL=OFF" "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" "-DLIBRESSL_ROOT_DIR=${CURRENT_INSTALLED_DIR}" - "-DBUILD_SHARED_LIBS:BOOL=${OATPP_BUILD_SHARED_LIBRARIES_OPTION}" + ) vcpkg_install_cmake() diff --git a/ports/oatpp-mbedtls/portfile.cmake b/ports/oatpp-mbedtls/portfile.cmake index 3076b4e300fc5e..bca063d27c9332 100644 --- a/ports/oatpp-mbedtls/portfile.cmake +++ b/ports/oatpp-mbedtls/portfile.cmake @@ -11,18 +11,14 @@ vcpkg_from_github( PATCHES find-mbedtls.patch ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "ON") -else() - set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "OFF") -endif() + vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" - "-DBUILD_SHARED_LIBS:BOOL=${OATPP_BUILD_SHARED_LIBRARIES_OPTION}" + ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-mbedtls-${OATPP_VERSION}) diff --git a/ports/oatpp-sqlite/portfile.cmake b/ports/oatpp-sqlite/portfile.cmake index 667a7c5023db0a..3f0ce130137f3b 100644 --- a/ports/oatpp-sqlite/portfile.cmake +++ b/ports/oatpp-sqlite/portfile.cmake @@ -5,16 +5,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-sqlite - REF 932a79f1db5a0dfd6955c8fd84dc7bd2e5962be1 # 1.2.0 - SHA512 12004d9339d6debc86513f78d17f9a41bf29a60d41c084e0698044b49c549b10bd3ddea35a6b2eabf8de06da54394695797bb7972888f57fc2938f1596fe03a0 + REF 3dc3c141467d18f4f552a2a26c1fff5a3e28fe7d # 1.2.0 + SHA512 65e1cea564d2c771e352cc7ba8e71360c7b30806ebffd03a398d0620a68efdd786b3eb5359b28833da556b8aad19f9604fa727df61665af6d8686a63112326f1 HEAD_REF master ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "ON") -else() - set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "OFF") -endif() vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}" @@ -22,7 +17,7 @@ vcpkg_configure_cmake( OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" - "-DBUILD_SHARED_LIBS:BOOL=${OATPP_BUILD_SHARED_LIBRARIES_OPTION}" + ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-sqlite-${OATPP_VERSION}) diff --git a/ports/oatpp-swagger/portfile.cmake b/ports/oatpp-swagger/portfile.cmake index 00a538a018a9b0..481a66d14300e6 100644 --- a/ports/oatpp-swagger/portfile.cmake +++ b/ports/oatpp-swagger/portfile.cmake @@ -10,11 +10,7 @@ vcpkg_from_github( HEAD_REF master ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "ON") -else() - set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "OFF") -endif() + vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}" @@ -22,7 +18,7 @@ vcpkg_configure_cmake( OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" - "-DBUILD_SHARED_LIBS:BOOL=${OATPP_BUILD_SHARED_LIBRARIES_OPTION}" + ) vcpkg_install_cmake() diff --git a/ports/oatpp-websocket/portfile.cmake b/ports/oatpp-websocket/portfile.cmake index 4c349614700c85..cabb2c9a141f84 100644 --- a/ports/oatpp-websocket/portfile.cmake +++ b/ports/oatpp-websocket/portfile.cmake @@ -10,18 +10,14 @@ vcpkg_from_github( HEAD_REF master ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "ON") -else() - set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "OFF") -endif() + vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" - "-DBUILD_SHARED_LIBS:BOOL=${OATPP_BUILD_SHARED_LIBRARIES_OPTION}" + ) vcpkg_install_cmake() diff --git a/ports/oatpp/portfile.cmake b/ports/oatpp/portfile.cmake index 82c72d27308fd2..0b4cfc369b2e8d 100644 --- a/ports/oatpp/portfile.cmake +++ b/ports/oatpp/portfile.cmake @@ -10,11 +10,6 @@ vcpkg_from_github( HEAD_REF master ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "ON") -else() - set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "OFF") -endif() vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}" @@ -22,7 +17,7 @@ vcpkg_configure_cmake( OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" - "-DBUILD_SHARED_LIBS:BOOL=${OATPP_BUILD_SHARED_LIBRARIES_OPTION}" + ) vcpkg_install_cmake() From 62b3e386b75fc8d0ea4ad080ffa96dbf659134fe Mon Sep 17 00:00:00 2001 From: Kaung Zaw Htet Date: Tue, 27 Oct 2020 13:05:52 +0630 Subject: [PATCH 05/20] sqlite dependency fixed for experimental --- ports/oatpp-sqlite/CONTROL | 2 +- ports/oatpp-sqlite/portfile.cmake | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ports/oatpp-sqlite/CONTROL b/ports/oatpp-sqlite/CONTROL index abc77a32ff2958..d0ec33e774e364 100644 --- a/ports/oatpp-sqlite/CONTROL +++ b/ports/oatpp-sqlite/CONTROL @@ -1,5 +1,5 @@ Source: oatpp-sqlite Version: 1.2.0 Description: OAT++ Modern web framework sqlite module -Build-Depends: oatpp +Build-Depends: oatpp,sqlite3 Homepage: https://github.com/oatpp/oatpp-sqlite diff --git a/ports/oatpp-sqlite/portfile.cmake b/ports/oatpp-sqlite/portfile.cmake index 3f0ce130137f3b..7cc344c74b639f 100644 --- a/ports/oatpp-sqlite/portfile.cmake +++ b/ports/oatpp-sqlite/portfile.cmake @@ -4,10 +4,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO oatpp/oatpp-sqlite - REF 3dc3c141467d18f4f552a2a26c1fff5a3e28fe7d # 1.2.0 - SHA512 65e1cea564d2c771e352cc7ba8e71360c7b30806ebffd03a398d0620a68efdd786b3eb5359b28833da556b8aad19f9604fa727df61665af6d8686a63112326f1 - HEAD_REF master + REPO KaungZawHtet/oatpp-sqlite + REF 4b3721f1555182117dec446d3121a56d9985b434 # 1.2.0 + SHA512 fed081c362c86689fbb751d6607059ef1f503ed64f4c695d9077e85007969e70e52dc511b21be82b741d323c4cb782f58d0c4c459040c122ac43e4fdcff50d2d + HEAD_REF experimental ) @@ -17,6 +17,7 @@ vcpkg_configure_cmake( OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" + "-DOATPP_SQLITE_AMALGAMATION:BOOL=OFF" ) vcpkg_install_cmake() From c46a53aebe41f62121cbc98dc7a875d1fbfb7abf Mon Sep 17 00:00:00 2001 From: Kaung Zaw Htet Date: Wed, 28 Oct 2020 00:55:53 +0630 Subject: [PATCH 06/20] experiment with VCPKG_TOOLCHAIN --- ports/oatpp-sqlite/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/oatpp-sqlite/portfile.cmake b/ports/oatpp-sqlite/portfile.cmake index 7cc344c74b639f..d33bf20a314481 100644 --- a/ports/oatpp-sqlite/portfile.cmake +++ b/ports/oatpp-sqlite/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KaungZawHtet/oatpp-sqlite - REF 4b3721f1555182117dec446d3121a56d9985b434 # 1.2.0 - SHA512 fed081c362c86689fbb751d6607059ef1f503ed64f4c695d9077e85007969e70e52dc511b21be82b741d323c4cb782f58d0c4c459040c122ac43e4fdcff50d2d + REF b69459eb0c0c1482d4484ec2915c5df55504c634 # 1.2.0 + SHA512 9949f05c2e16eb4a7d776a93756228dda0e8ae0a17ada6fd167818915b46f526aa3ba77d3899b7843f775f72c05faa813c466980432c5089dae8686524f29308 HEAD_REF experimental ) From 18973db20c21245d1d99309689006409df56e47d Mon Sep 17 00:00:00 2001 From: Kaung Zaw Htet Date: Wed, 28 Oct 2020 02:21:27 +0630 Subject: [PATCH 07/20] move to original repository --- ports/oatpp-sqlite/portfile.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/oatpp-sqlite/portfile.cmake b/ports/oatpp-sqlite/portfile.cmake index d33bf20a314481..f42264b8e51270 100644 --- a/ports/oatpp-sqlite/portfile.cmake +++ b/ports/oatpp-sqlite/portfile.cmake @@ -4,10 +4,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO KaungZawHtet/oatpp-sqlite - REF b69459eb0c0c1482d4484ec2915c5df55504c634 # 1.2.0 - SHA512 9949f05c2e16eb4a7d776a93756228dda0e8ae0a17ada6fd167818915b46f526aa3ba77d3899b7843f775f72c05faa813c466980432c5089dae8686524f29308 - HEAD_REF experimental + REPO oatpp/oatpp-sqlite + REF 5128a4a1dc1f6ff5d0618237d1dbb9e9d5447e2f # 1.2.0 + SHA512 d066701d4c857e895816db14c9700f321e171d2f990ee1c505c8b5243351d726db973d61ec7ebbe1b3f19e678627c41975aeac24fd2891d41900dfb25d427903 + HEAD_REF master ) From aad31ad82fcf02aec2120969f187e630e41c0047 Mon Sep 17 00:00:00 2001 From: Kaung Zaw Htet Date: Wed, 28 Oct 2020 03:54:17 +0630 Subject: [PATCH 08/20] fixed to reach Avocato Oats --- ports/oatpp/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/oatpp/portfile.cmake b/ports/oatpp/portfile.cmake index 0b4cfc369b2e8d..a5825b0af3a159 100644 --- a/ports/oatpp/portfile.cmake +++ b/ports/oatpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp - REF 2d8711307e23e9f022cbe2758c07ce4e44e8d31f # 1.2.0 - SHA512 ae99467034360a4eb20a8a49e8ccd5e39ed9d71f9cd07d5b9bf2be0db7a7bff65415b0086de4ae267701c09f7b48fdf5d4d8ccb22f05fd41805232894b39b06c + REF 8f1c11ae534e1f03646de8efcc9b2505fb1881cc # 1.2.0 + SHA512 4661aefe89be8153b08be0eb95ce688d5af3abd80e8f92fe3b2f1ac9dc76228383b05f7b33314de5f25d433013d6d287650ed156b69244b0d9ba8b604df8aaa3 HEAD_REF master ) From bde77ae224b44c35801e528638d5e4b2247a21dc Mon Sep 17 00:00:00 2001 From: Kaung Zaw Htet Date: Thu, 29 Oct 2020 14:00:26 +0630 Subject: [PATCH 09/20] bump control files of oatpps except oatpp-sqlite --- ports/oatpp-consul/CONTROL | 1 + ports/oatpp-curl/CONTROL | 1 + ports/oatpp-libressl/CONTROL | 1 + ports/oatpp-mbedtls/CONTROL | 1 + ports/oatpp-swagger/CONTROL | 1 + ports/oatpp-websocket/CONTROL | 1 + ports/oatpp/CONTROL | 1 + 7 files changed, 7 insertions(+) diff --git a/ports/oatpp-consul/CONTROL b/ports/oatpp-consul/CONTROL index d24cb76253ebe7..573634766ccf28 100644 --- a/ports/oatpp-consul/CONTROL +++ b/ports/oatpp-consul/CONTROL @@ -1,5 +1,6 @@ Source: oatpp-consul Version: 1.2.0 +Port-Version: 1 Description: OAT++ Modern web framework consul module Build-Depends: oatpp Homepage: https://github.com/oatpp/oatpp-consul diff --git a/ports/oatpp-curl/CONTROL b/ports/oatpp-curl/CONTROL index 661d8877e2c614..a05945d4b1377c 100644 --- a/ports/oatpp-curl/CONTROL +++ b/ports/oatpp-curl/CONTROL @@ -1,5 +1,6 @@ Source: oatpp-curl Version: 1.2.0 +Port-Version: 1 Description: Oat++ Modern web framework curl module to use libcurl as a RequestExecutor on the oatpp's ApiClient Build-Depends: curl,oatpp Homepage: https://github.com/oatpp/oatpp-curl diff --git a/ports/oatpp-libressl/CONTROL b/ports/oatpp-libressl/CONTROL index b9ecc1f56631e4..9fdfada647c7b8 100644 --- a/ports/oatpp-libressl/CONTROL +++ b/ports/oatpp-libressl/CONTROL @@ -1,5 +1,6 @@ Source: oatpp-libressl Version: 1.2.0 +Port-Version: 1 Build-Depends: libressl, oatpp Description: Oat++ libressl module providing secure server and client connection providers Homepage: https://github.com/oatpp/oatpp-libressl diff --git a/ports/oatpp-mbedtls/CONTROL b/ports/oatpp-mbedtls/CONTROL index 3554f89bdf426a..235cbbe5b53d26 100644 --- a/ports/oatpp-mbedtls/CONTROL +++ b/ports/oatpp-mbedtls/CONTROL @@ -1,5 +1,6 @@ Source: oatpp-mbedtls Version: 1.2.0 +Port-Version: 1 Build-Depends: mbedtls, oatpp Description: Oat++ Mbed TLS submodule providing secure server and client connection providers Homepage: https://github.com/oatpp/oatpp-mbedtls diff --git a/ports/oatpp-swagger/CONTROL b/ports/oatpp-swagger/CONTROL index d6d8889e55c592..19858661e9d0d6 100644 --- a/ports/oatpp-swagger/CONTROL +++ b/ports/oatpp-swagger/CONTROL @@ -1,5 +1,6 @@ Source: oatpp-swagger Version: 1.2.0 +Port-Version: 1 Description: Oat++ OpenApi (Swagger) UI submodule Build-Depends: oatpp Homepage: https://github.com/oatpp/oatpp-swagger diff --git a/ports/oatpp-websocket/CONTROL b/ports/oatpp-websocket/CONTROL index 7d915ed0be4a47..ca110b0ec8179c 100644 --- a/ports/oatpp-websocket/CONTROL +++ b/ports/oatpp-websocket/CONTROL @@ -1,5 +1,6 @@ Source: oatpp-websocket Version: 1.2.0 +Port-Version: 1 Description: Oat++ websocket module Build-Depends: oatpp Homepage: https://github.com/oatpp/oatpp-websocket diff --git a/ports/oatpp/CONTROL b/ports/oatpp/CONTROL index 45de646a59d5b9..3ebedee6904d8d 100644 --- a/ports/oatpp/CONTROL +++ b/ports/oatpp/CONTROL @@ -1,4 +1,5 @@ Source: oatpp +Port-Version: 1 Version: 1.2.0 Description: Modern web framework Homepage: https://github.com/oatpp/oatpp From 0a25bc523a1c9286c2529b846934d47b424762a7 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 29 Oct 2020 15:45:21 +0800 Subject: [PATCH 10/20] Update portfile.cmake Update space lines --- ports/oatpp-consul/portfile.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/oatpp-consul/portfile.cmake b/ports/oatpp-consul/portfile.cmake index 53d3363760fd0c..f7e857d4470608 100644 --- a/ports/oatpp-consul/portfile.cmake +++ b/ports/oatpp-consul/portfile.cmake @@ -10,8 +10,6 @@ vcpkg_from_github( HEAD_REF master ) - - vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA @@ -20,6 +18,7 @@ vcpkg_configure_cmake( "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" ) + vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-consul-${OATPP_VERSION}) vcpkg_copy_pdbs() From cad276395a962873fe6e13bd16c7369dd1ecc5eb Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 29 Oct 2020 15:47:09 +0800 Subject: [PATCH 11/20] Update portfile.cmake Update space lines --- ports/oatpp-consul/portfile.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/oatpp-consul/portfile.cmake b/ports/oatpp-consul/portfile.cmake index f7e857d4470608..432798d0f2e2b1 100644 --- a/ports/oatpp-consul/portfile.cmake +++ b/ports/oatpp-consul/portfile.cmake @@ -15,8 +15,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" - "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" - + "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" ) vcpkg_install_cmake() From 440636973bd315d932c2eab173e6310e05fac538 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 29 Oct 2020 15:49:20 +0800 Subject: [PATCH 12/20] Update portfile.cmake --- ports/oatpp-curl/portfile.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ports/oatpp-curl/portfile.cmake b/ports/oatpp-curl/portfile.cmake index fd326570bd8cf6..e8fd3a50deb801 100644 --- a/ports/oatpp-curl/portfile.cmake +++ b/ports/oatpp-curl/portfile.cmake @@ -11,16 +11,14 @@ vcpkg_from_github( PATCHES "curl-submodule-no-pkg-config-in-vcpkg.patch" ) - - vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" - "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" - + "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" ) + vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-curl-${OATPP_VERSION}) vcpkg_copy_pdbs() From fa5763e728d5dc5b48b2c76e5833b37056c6b4c2 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 29 Oct 2020 15:49:59 +0800 Subject: [PATCH 13/20] Update portfile.cmake --- ports/oatpp-libressl/portfile.cmake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ports/oatpp-libressl/portfile.cmake b/ports/oatpp-libressl/portfile.cmake index 83aa24518bbd37..23f70de8829716 100644 --- a/ports/oatpp-libressl/portfile.cmake +++ b/ports/oatpp-libressl/portfile.cmake @@ -12,16 +12,13 @@ vcpkg_from_github( PATCHES "libress-submodule-downgrade-required-libressl-version.patch" ) - - vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" - "-DLIBRESSL_ROOT_DIR=${CURRENT_INSTALLED_DIR}" - + "-DLIBRESSL_ROOT_DIR=${CURRENT_INSTALLED_DIR}" ) vcpkg_install_cmake() From 3e67e8d9b0ae893eca988ec8806789dd703db5d5 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 29 Oct 2020 15:50:30 +0800 Subject: [PATCH 14/20] Update portfile.cmake --- ports/oatpp-mbedtls/portfile.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ports/oatpp-mbedtls/portfile.cmake b/ports/oatpp-mbedtls/portfile.cmake index bca063d27c9332..990b244ed7e972 100644 --- a/ports/oatpp-mbedtls/portfile.cmake +++ b/ports/oatpp-mbedtls/portfile.cmake @@ -11,15 +11,13 @@ vcpkg_from_github( PATCHES find-mbedtls.patch ) - - vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS - "-DOATPP_BUILD_TESTS:BOOL=OFF" - + "-DOATPP_BUILD_TESTS:BOOL=OFF" ) + vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-mbedtls-${OATPP_VERSION}) vcpkg_copy_pdbs() From 3018715cb776155b46a3d6f18696b9584f1ffaea Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 29 Oct 2020 15:50:58 +0800 Subject: [PATCH 15/20] Update portfile.cmake --- ports/oatpp-swagger/portfile.cmake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ports/oatpp-swagger/portfile.cmake b/ports/oatpp-swagger/portfile.cmake index 481a66d14300e6..bc600b7e4d7861 100644 --- a/ports/oatpp-swagger/portfile.cmake +++ b/ports/oatpp-swagger/portfile.cmake @@ -10,15 +10,12 @@ vcpkg_from_github( HEAD_REF master ) - - vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" - "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" - + "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" ) vcpkg_install_cmake() From 8e23524edf3af9e8eaaf6f500e023cacef186cbf Mon Sep 17 00:00:00 2001 From: Kaung Zaw Htet Date: Thu, 29 Oct 2020 14:21:03 +0630 Subject: [PATCH 16/20] Port version follows lib's version --- ports/oatpp/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/oatpp/CONTROL b/ports/oatpp/CONTROL index 3ebedee6904d8d..c0c7cf31e1884e 100644 --- a/ports/oatpp/CONTROL +++ b/ports/oatpp/CONTROL @@ -1,5 +1,5 @@ Source: oatpp -Port-Version: 1 Version: 1.2.0 +Port-Version: 1 Description: Modern web framework Homepage: https://github.com/oatpp/oatpp From 144960a84051f44e14c3d6331b9186b723edac3a Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 29 Oct 2020 15:51:23 +0800 Subject: [PATCH 17/20] Update portfile.cmake --- ports/oatpp-websocket/portfile.cmake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ports/oatpp-websocket/portfile.cmake b/ports/oatpp-websocket/portfile.cmake index cabb2c9a141f84..7485d9cf50764d 100644 --- a/ports/oatpp-websocket/portfile.cmake +++ b/ports/oatpp-websocket/portfile.cmake @@ -10,14 +10,11 @@ vcpkg_from_github( HEAD_REF master ) - - vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS - "-DOATPP_BUILD_TESTS:BOOL=OFF" - + "-DOATPP_BUILD_TESTS:BOOL=OFF" ) vcpkg_install_cmake() From 7a294aa6e2491bf126d7bd884349a32dc7edf294 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 29 Oct 2020 15:53:32 +0800 Subject: [PATCH 18/20] Update portfile.cmake --- ports/oatpp/portfile.cmake | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ports/oatpp/portfile.cmake b/ports/oatpp/portfile.cmake index e1fdd9d14b6ed7..ed21d2b79e9b92 100644 --- a/ports/oatpp/portfile.cmake +++ b/ports/oatpp/portfile.cmake @@ -5,21 +5,17 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp - REF 8f1c11ae534e1f03646de8efcc9b2505fb1881cc # 1.2.0 SHA512 4661aefe89be8153b08be0eb95ce688d5af3abd80e8f92fe3b2f1ac9dc76228383b05f7b33314de5f25d433013d6d287650ed156b69244b0d9ba8b604df8aaa3 - HEAD_REF master ) - vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" - "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" - + "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" ) vcpkg_install_cmake() From 1cfe67254ea2b7dd2f7f3d729b65e8d2d8f8afb6 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 29 Oct 2020 16:00:55 +0800 Subject: [PATCH 19/20] Update ports/oatpp-sqlite/portfile.cmake --- ports/oatpp-sqlite/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/oatpp-sqlite/portfile.cmake b/ports/oatpp-sqlite/portfile.cmake index f42264b8e51270..d424e6e8e72a8e 100644 --- a/ports/oatpp-sqlite/portfile.cmake +++ b/ports/oatpp-sqlite/portfile.cmake @@ -10,7 +10,6 @@ vcpkg_from_github( HEAD_REF master ) - vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA From 30f4c51bc1507f17a59445e4476ef50f446f4e74 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 29 Oct 2020 16:01:03 +0800 Subject: [PATCH 20/20] Update ports/oatpp-sqlite/portfile.cmake --- ports/oatpp-sqlite/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/oatpp-sqlite/portfile.cmake b/ports/oatpp-sqlite/portfile.cmake index d424e6e8e72a8e..cc1c4c0b3b66c9 100644 --- a/ports/oatpp-sqlite/portfile.cmake +++ b/ports/oatpp-sqlite/portfile.cmake @@ -17,7 +17,6 @@ vcpkg_configure_cmake( "-DOATPP_BUILD_TESTS:BOOL=OFF" "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" "-DOATPP_SQLITE_AMALGAMATION:BOOL=OFF" - ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-sqlite-${OATPP_VERSION})