[oatpp*] Remove CMAKE_CXX_FLAGS setting (#26116)

* Move CMAKE_CXX_FLAGS to VCPKG_CXX_FLAGS * version * Also set VCPKG_C_FLAGS * version * apply suggestions and fix other ports * version * apply suggestion * version * try to figure out what triplet needs crt macros * version
2024-11-24 01:59:00 +08:00 · 2022-08-04 02:24:13 +00:00 · 2022-08-04 02:24:13 +00:00 · 6cdfcb2658
commit 6cdfcb2658
parent 382a3044b5
31 changed files with 85 additions and 31 deletions
--- a/ports/oatpp-consul/portfile.cmake
+++ b/ports/oatpp-consul/portfile.cmake
@ -14,7 +14,6 @@ vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
        "-DOATPP_BUILD_TESTS:BOOL=OFF"
-        "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS"     
 )

 vcpkg_cmake_install()
--- a/ports/oatpp-consul/vcpkg.json
+++ b/ports/oatpp-consul/vcpkg.json
@ -1,8 +1,10 @@
 {
  "name": "oatpp-consul",
  "version": "1.3.0",
+  "port-version": 1,
  "description": "OAT++ Modern web framework consul module.",
  "homepage": "https://github.com/oatpp/oatpp-consul",
+  "license": "Apache-2.0",
  "dependencies": [
    "oatpp",
    {
--- a/ports/oatpp-curl/portfile.cmake
+++ b/ports/oatpp-curl/portfile.cmake
@ -15,7 +15,6 @@ vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
        "-DOATPP_BUILD_TESTS:BOOL=OFF"
-        "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS"   
 )

 vcpkg_cmake_install()
--- a/ports/oatpp-curl/vcpkg.json
+++ b/ports/oatpp-curl/vcpkg.json
@ -1,8 +1,10 @@
 {
  "name": "oatpp-curl",
  "version": "1.3.0",
+  "port-version": 1,
  "description": "Oat++ Modern web framework curl module to use libcurl as a RequestExecutor on the oatpp's ApiClient.",
  "homepage": "https://github.com/oatpp/oatpp-curl",
+  "license": "Apache-2.0",
  "dependencies": [
    "curl",
    "oatpp",
--- a/ports/oatpp-libressl/portfile.cmake
+++ b/ports/oatpp-libressl/portfile.cmake
@ -16,8 +16,7 @@ vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
    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_cmake_install()
--- a/ports/oatpp-libressl/vcpkg.json
+++ b/ports/oatpp-libressl/vcpkg.json
@ -1,8 +1,10 @@
 {
  "name": "oatpp-libressl",
  "version": "1.3.0",
+  "port-version": 1,
  "description": "Oat++ libressl module providing secure server and client connection providers.",
  "homepage": "https://github.com/oatpp/oatpp-libressl",
+  "license": "Apache-2.0",
  "dependencies": [
    "libressl",
    "oatpp",
--- a/ports/oatpp-mongo/portfile.cmake
+++ b/ports/oatpp-mongo/portfile.cmake
@ -10,9 +10,6 @@ vcpkg_from_github(
    HEAD_REF master
 )

-set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
-set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
-
 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
--- a/ports/oatpp-mongo/vcpkg.json
+++ b/ports/oatpp-mongo/vcpkg.json
@ -1,8 +1,10 @@
 {
  "name": "oatpp-mongo",
  "version": "1.3.0",
+  "port-version": 1,
  "description": "Oat++ MongoDB adapter for Oat++ ORM (native client). It contains DTO to BSON mapper plus database driver.",
  "homepage": "https://github.com/oatpp/oatpp-mongo",
+  "license": "Apache-2.0",
  "dependencies": [
    "oatpp",
    {
--- a/ports/oatpp-postgresql/portfile.cmake
+++ b/ports/oatpp-postgresql/portfile.cmake
@ -10,9 +10,6 @@ vcpkg_from_github(
    HEAD_REF master
 )

-set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
-set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
-
 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
--- a/ports/oatpp-postgresql/vcpkg.json
+++ b/ports/oatpp-postgresql/vcpkg.json
@ -1,8 +1,10 @@
 {
  "name": "oatpp-postgresql",
  "version": "1.3.0",
+  "port-version": 1,
  "description": "Oat++ PostgreSQL adapter for Oat++ ORM (alpha - not all datatypes are supported).",
  "homepage": "https://github.com/oatpp/oatpp-postgresql",
+  "license": "Apache-2.0",
  "dependencies": [
    "libpq",
    "oatpp",
--- a/ports/oatpp-sqlite/portfile.cmake
+++ b/ports/oatpp-sqlite/portfile.cmake
@ -14,7 +14,6 @@ vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
        "-DOATPP_BUILD_TESTS:BOOL=OFF"
-        "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS"
        "-DOATPP_SQLITE_AMALGAMATION:BOOL=OFF"
 )
 vcpkg_cmake_install()
--- a/ports/oatpp-sqlite/vcpkg.json
+++ b/ports/oatpp-sqlite/vcpkg.json
@ -1,8 +1,10 @@
 {
  "name": "oatpp-sqlite",
  "version": "1.3.0",
+  "port-version": 1,
  "description": "Oat++ SQLite adapter for Oat++ ORM.",
  "homepage": "https://github.com/oatpp/oatpp-sqlite",
+  "license": "Apache-2.0",
  "dependencies": [
    "oatpp",
    "sqlite3",
--- a/ports/oatpp-ssdp/portfile.cmake
+++ b/ports/oatpp-ssdp/portfile.cmake
@ -17,7 +17,6 @@ vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
        "-DOATPP_BUILD_TESTS:BOOL=OFF"
-        "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS"
 )

 vcpkg_cmake_install()
--- a/ports/oatpp-ssdp/vcpkg.json
+++ b/ports/oatpp-ssdp/vcpkg.json
@ -1,8 +1,10 @@
 {
  "name": "oatpp-ssdp",
  "version": "1.3.0",
+  "port-version": 1,
  "description": "Oat++ SSDP (Simple Service Discovery Protocol) submodule.",
  "homepage": "https://github.com/oatpp/oatpp-ssdp",
+  "license": "Apache-2.0",
  "dependencies": [
    "oatpp",
    {
--- a/ports/oatpp-swagger/portfile.cmake
+++ b/ports/oatpp-swagger/portfile.cmake
@ -20,8 +20,7 @@ vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
        "-DOATPP_BUILD_TESTS:BOOL=OFF"
-        "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" 
-	"-DOATPP_MSVC_LINK_STATIC_RUNTIME=${OATPP_MSVC_LINK_STATIC_RUNTIME}"       
+        "-DOATPP_MSVC_LINK_STATIC_RUNTIME=${OATPP_MSVC_LINK_STATIC_RUNTIME}"
 )

 vcpkg_cmake_install()
--- a/ports/oatpp-swagger/vcpkg.json
+++ b/ports/oatpp-swagger/vcpkg.json
@ -1,8 +1,10 @@
 {
  "name": "oatpp-swagger",
  "version": "1.3.0",
+  "port-version": 1,
  "description": "Oat++ OpenApi (Swagger) UI submodule.",
  "homepage": "https://github.com/oatpp/oatpp-swagger",
+  "license": "Apache-2.0",
  "dependencies": [
    "oatpp",
    {
--- a/ports/oatpp-zlib/portfile.cmake
+++ b/ports/oatpp-zlib/portfile.cmake
@ -10,9 +10,6 @@ vcpkg_from_github(
    HEAD_REF master
 )

-set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
-set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
-
 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
--- a/ports/oatpp-zlib/vcpkg.json
+++ b/ports/oatpp-zlib/vcpkg.json
@ -1,8 +1,10 @@
 {
  "name": "oatpp-zlib",
  "version": "1.3.0",
+  "port-version": 1,
  "description": "Oat++ functionality for automatically compressing/decompressing content with deflate and gzip.",
  "homepage": "https://github.com/oatpp/oatpp-zlib",
+  "license": "Apache-2.0",
  "dependencies": [
    "oatpp",
    {
--- a/ports/oatpp/portfile.cmake
+++ b/ports/oatpp/portfile.cmake
@ -20,13 +20,12 @@ vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
        "-DOATPP_BUILD_TESTS:BOOL=OFF"
-        "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS"       
-	"-DOATPP_MSVC_LINK_STATIC_RUNTIME=${OATPP_MSVC_LINK_STATIC_RUNTIME}"       
+        "-DOATPP_MSVC_LINK_STATIC_RUNTIME=${OATPP_MSVC_LINK_STATIC_RUNTIME}"
 )

 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp CONFIG_PATH lib/cmake/oatpp-${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)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
--- a/ports/oatpp/vcpkg.json
+++ b/ports/oatpp/vcpkg.json
@ -1,8 +1,10 @@
 {
  "name": "oatpp",
  "version": "1.3.0",
+  "port-version": 1,
  "description": "Modern web framework.",
  "homepage": "https://github.com/oatpp/oatpp",
+  "license": "Apache-2.0",
  "dependencies": [
    {
      "name": "vcpkg-cmake",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -5026,19 +5026,19 @@
    },
    "oatpp": {
      "baseline": "1.3.0",
-      "port-version": 0
+      "port-version": 1
    },
    "oatpp-consul": {
      "baseline": "1.3.0",
-      "port-version": 0
+      "port-version": 1
    },
    "oatpp-curl": {
      "baseline": "1.3.0",
-      "port-version": 0
+      "port-version": 1
    },
    "oatpp-libressl": {
      "baseline": "1.3.0",
-      "port-version": 0
+      "port-version": 1
    },
    "oatpp-mbedtls": {
      "baseline": "1.3.0",
@ -5046,7 +5046,7 @@
    },
    "oatpp-mongo": {
      "baseline": "1.3.0",
-      "port-version": 0
+      "port-version": 1
    },
    "oatpp-openssl": {
      "baseline": "1.3.0",
@ -5054,19 +5054,19 @@
    },
    "oatpp-postgresql": {
      "baseline": "1.3.0",
-      "port-version": 0
+      "port-version": 1
    },
    "oatpp-sqlite": {
      "baseline": "1.3.0",
-      "port-version": 0
+      "port-version": 1
    },
    "oatpp-ssdp": {
      "baseline": "1.3.0",
-      "port-version": 0
+      "port-version": 1
    },
    "oatpp-swagger": {
      "baseline": "1.3.0",
-      "port-version": 0
+      "port-version": 1
    },
    "oatpp-websocket": {
      "baseline": "1.3.0",
@ -5074,7 +5074,7 @@
    },
    "oatpp-zlib": {
      "baseline": "1.3.0",
-      "port-version": 0
+      "port-version": 1
    },
    "observer-ptr-lite": {
      "baseline": "0.4.0",
--- a/versions/o-/oatpp-consul.json
+++ b/versions/o-/oatpp-consul.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "cbf60e5cb055ff29081126e61debb330651a24fd",
+      "version": "1.3.0",
+      "port-version": 1
+    },
    {
      "git-tree": "a7dbba8dd8a15ee5a573d8893af3755c2c61e082",
      "version": "1.3.0",
--- a/versions/o-/oatpp-curl.json
+++ b/versions/o-/oatpp-curl.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "ca3da373f9eca04129ab53c726e00678b7727a6e",
+      "version": "1.3.0",
+      "port-version": 1
+    },
    {
      "git-tree": "ae678502914406793d56adb1bffbede8febdfb77",
      "version": "1.3.0",
--- a/versions/o-/oatpp-libressl.json
+++ b/versions/o-/oatpp-libressl.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "c52fe5660b4e58aa5782ccd3a43e5298f4225fe1",
+      "version": "1.3.0",
+      "port-version": 1
+    },
    {
      "git-tree": "9a94780d515079c88f644ac92b35f935fff138b5",
      "version": "1.3.0",
--- a/versions/o-/oatpp-mongo.json
+++ b/versions/o-/oatpp-mongo.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "0e9c046ae1943591d58c8e48aee697a0e7718f8d",
+      "version": "1.3.0",
+      "port-version": 1
+    },
    {
      "git-tree": "bb2cca9b0d5255e9c250210b6da94b8383673530",
      "version": "1.3.0",
--- a/versions/o-/oatpp-postgresql.json
+++ b/versions/o-/oatpp-postgresql.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "8d182a4a2fa22b5a9da9b16eca3a37d7bdb74b44",
+      "version": "1.3.0",
+      "port-version": 1
+    },
    {
      "git-tree": "f5475ec4475805e185290f9b6676cb0b3471d469",
      "version": "1.3.0",
--- a/versions/o-/oatpp-sqlite.json
+++ b/versions/o-/oatpp-sqlite.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "b28e241610e463b41e9c3e3f16f5805b19fb5fa5",
+      "version": "1.3.0",
+      "port-version": 1
+    },
    {
      "git-tree": "83864d8dac636388be925bc5228fb6067ff0c634",
      "version": "1.3.0",
--- a/versions/o-/oatpp-ssdp.json
+++ b/versions/o-/oatpp-ssdp.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "7f3fb7a485473cfc812dbd4fbc93c291db75aeea",
+      "version": "1.3.0",
+      "port-version": 1
+    },
    {
      "git-tree": "37d034f06503445f5a4ac52a960f4360cb68ce58",
      "version": "1.3.0",
--- a/versions/o-/oatpp-swagger.json
+++ b/versions/o-/oatpp-swagger.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "b8935367b57b4203e0eba828a6b8f9cc5ebb659c",
+      "version": "1.3.0",
+      "port-version": 1
+    },
    {
      "git-tree": "4f0bc8c1d3f156e6d2a7cee4691154c0973b12bd",
      "version": "1.3.0",
--- a/versions/o-/oatpp-zlib.json
+++ b/versions/o-/oatpp-zlib.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "0f40812d2446d50d41add9deba46e0baa042ac53",
+      "version": "1.3.0",
+      "port-version": 1
+    },
    {
      "git-tree": "74e51d02fac6e71c8bad4856fc97767f8d3041ea",
      "version": "1.3.0",
--- a/versions/o-/oatpp.json
+++ b/versions/o-/oatpp.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "f3700f7d93bbb8922878c25705d0e00cd7049066",
+      "version": "1.3.0",
+      "port-version": 1
+    },
    {
      "git-tree": "85f50043f867de15e428b3d0f8749a5aabc34e86",
      "version": "1.3.0",