mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-04 03:29:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[oatpp*] Remove CMAKE_CXX_FLAGS setting (#26116)

Browse Source 
* 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
This commit is contained in:
Jack·Boos·Yu 2022-08-04 02:24:13 +00:00 committed by GitHub
parent 382a3044b5
commit 6cdfcb2658
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 85 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ports/oatpp-consul/portfile.cmake
View File

@ -14,7 +14,6 @@ vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS
"-DOATPP_BUILD_TESTS:BOOL=OFF" "-DOATPP_BUILD_TESTS:BOOL=OFF"
"-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS"
) )
vcpkg_cmake_install() vcpkg_cmake_install()

2
ports/oatpp-consul/vcpkg.json
View File

@ -1,8 +1,10 @@
{ {
"name": "oatpp-consul", "name": "oatpp-consul",
"version": "1.3.0", "version": "1.3.0",
"port-version": 1,
"description": "OAT++ Modern web framework consul module.", "description": "OAT++ Modern web framework consul module.",
"homepage": "https://github.com/oatpp/oatpp-consul", "homepage": "https://github.com/oatpp/oatpp-consul",
"license": "Apache-2.0",
"dependencies": [ "dependencies": [
"oatpp", "oatpp",
{ {

1
ports/oatpp-curl/portfile.cmake
View File

@ -15,7 +15,6 @@ vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS
"-DOATPP_BUILD_TESTS:BOOL=OFF" "-DOATPP_BUILD_TESTS:BOOL=OFF"
"-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS"
) )
vcpkg_cmake_install() vcpkg_cmake_install()

2
ports/oatpp-curl/vcpkg.json
View File

@ -1,8 +1,10 @@
{ {
"name": "oatpp-curl", "name": "oatpp-curl",
"version": "1.3.0", "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.", "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", "homepage": "https://github.com/oatpp/oatpp-curl",
"license": "Apache-2.0",
"dependencies": [ "dependencies": [
"curl", "curl",
"oatpp", "oatpp",

1
ports/oatpp-libressl/portfile.cmake
View File

@ -16,7 +16,6 @@ vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS
"-DOATPP_BUILD_TESTS:BOOL=OFF" "-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}"
) )

2
ports/oatpp-libressl/vcpkg.json
View File

@ -1,8 +1,10 @@
{ {
"name": "oatpp-libressl", "name": "oatpp-libressl",
"version": "1.3.0", "version": "1.3.0",
"port-version": 1,
"description": "Oat++ libressl module providing secure server and client connection providers.", "description": "Oat++ libressl module providing secure server and client connection providers.",
"homepage": "https://github.com/oatpp/oatpp-libressl", "homepage": "https://github.com/oatpp/oatpp-libressl",
"license": "Apache-2.0",
"dependencies": [ "dependencies": [
"libressl", "libressl",
"oatpp", "oatpp",

3
ports/oatpp-mongo/portfile.cmake
View File

@ -10,9 +10,6 @@ vcpkg_from_github(
HEAD_REF master 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( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS

2
ports/oatpp-mongo/vcpkg.json
View File

@ -1,8 +1,10 @@
{ {
"name": "oatpp-mongo", "name": "oatpp-mongo",
"version": "1.3.0", "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.", "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", "homepage": "https://github.com/oatpp/oatpp-mongo",
"license": "Apache-2.0",
"dependencies": [ "dependencies": [
"oatpp", "oatpp",
{ {

3
ports/oatpp-postgresql/portfile.cmake
View File

@ -10,9 +10,6 @@ vcpkg_from_github(
HEAD_REF master 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( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS

2
ports/oatpp-postgresql/vcpkg.json
View File

@ -1,8 +1,10 @@
{ {
"name": "oatpp-postgresql", "name": "oatpp-postgresql",
"version": "1.3.0", "version": "1.3.0",
"port-version": 1,
"description": "Oat++ PostgreSQL adapter for Oat++ ORM (alpha - not all datatypes are supported).", "description": "Oat++ PostgreSQL adapter for Oat++ ORM (alpha - not all datatypes are supported).",
"homepage": "https://github.com/oatpp/oatpp-postgresql", "homepage": "https://github.com/oatpp/oatpp-postgresql",
"license": "Apache-2.0",
"dependencies": [ "dependencies": [
"libpq", "libpq",
"oatpp", "oatpp",

1
ports/oatpp-sqlite/portfile.cmake
View File

@ -14,7 +14,6 @@ vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS
"-DOATPP_BUILD_TESTS:BOOL=OFF" "-DOATPP_BUILD_TESTS:BOOL=OFF"
"-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS"
"-DOATPP_SQLITE_AMALGAMATION:BOOL=OFF" "-DOATPP_SQLITE_AMALGAMATION:BOOL=OFF"
) )
vcpkg_cmake_install() vcpkg_cmake_install()

2
ports/oatpp-sqlite/vcpkg.json
View File

@ -1,8 +1,10 @@
{ {
"name": "oatpp-sqlite", "name": "oatpp-sqlite",
"version": "1.3.0", "version": "1.3.0",
"port-version": 1,
"description": "Oat++ SQLite adapter for Oat++ ORM.", "description": "Oat++ SQLite adapter for Oat++ ORM.",
"homepage": "https://github.com/oatpp/oatpp-sqlite", "homepage": "https://github.com/oatpp/oatpp-sqlite",
"license": "Apache-2.0",
"dependencies": [ "dependencies": [
"oatpp", "oatpp",
"sqlite3", "sqlite3",

1
ports/oatpp-ssdp/portfile.cmake
View File

@ -17,7 +17,6 @@ vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS
"-DOATPP_BUILD_TESTS:BOOL=OFF" "-DOATPP_BUILD_TESTS:BOOL=OFF"
"-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS"
) )
vcpkg_cmake_install() vcpkg_cmake_install()

2
ports/oatpp-ssdp/vcpkg.json
View File

@ -1,8 +1,10 @@
{ {
"name": "oatpp-ssdp", "name": "oatpp-ssdp",
"version": "1.3.0", "version": "1.3.0",
"port-version": 1,
"description": "Oat++ SSDP (Simple Service Discovery Protocol) submodule.", "description": "Oat++ SSDP (Simple Service Discovery Protocol) submodule.",
"homepage": "https://github.com/oatpp/oatpp-ssdp", "homepage": "https://github.com/oatpp/oatpp-ssdp",
"license": "Apache-2.0",
"dependencies": [ "dependencies": [
"oatpp", "oatpp",
{ {

3
ports/oatpp-swagger/portfile.cmake
View File

@ -20,8 +20,7 @@ vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS
"-DOATPP_BUILD_TESTS:BOOL=OFF" "-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_install()

2
ports/oatpp-swagger/vcpkg.json
View File

@ -1,8 +1,10 @@
{ {
"name": "oatpp-swagger", "name": "oatpp-swagger",
"version": "1.3.0", "version": "1.3.0",
"port-version": 1,
"description": "Oat++ OpenApi (Swagger) UI submodule.", "description": "Oat++ OpenApi (Swagger) UI submodule.",
"homepage": "https://github.com/oatpp/oatpp-swagger", "homepage": "https://github.com/oatpp/oatpp-swagger",
"license": "Apache-2.0",
"dependencies": [ "dependencies": [
"oatpp", "oatpp",
{ {

3
ports/oatpp-zlib/portfile.cmake
View File

@ -10,9 +10,6 @@ vcpkg_from_github(
HEAD_REF master 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( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS

2
ports/oatpp-zlib/vcpkg.json
View File

@ -1,8 +1,10 @@
{ {
"name": "oatpp-zlib", "name": "oatpp-zlib",
"version": "1.3.0", "version": "1.3.0",
"port-version": 1,
"description": "Oat++ functionality for automatically compressing/decompressing content with deflate and gzip.", "description": "Oat++ functionality for automatically compressing/decompressing content with deflate and gzip.",
"homepage": "https://github.com/oatpp/oatpp-zlib", "homepage": "https://github.com/oatpp/oatpp-zlib",
"license": "Apache-2.0",
"dependencies": [ "dependencies": [
"oatpp", "oatpp",
{ {

7
ports/oatpp/portfile.cmake
View File

@ -20,13 +20,12 @@ vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS
"-DOATPP_BUILD_TESTS:BOOL=OFF" "-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_install()
vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp CONFIG_PATH lib/cmake/oatpp-${OATPP_VERSION}) vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp CONFIG_PATH lib/cmake/oatpp-${OATPP_VERSION})
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

2
ports/oatpp/vcpkg.json
View File

@ -1,8 +1,10 @@
{ {
"name": "oatpp", "name": "oatpp",
"version": "1.3.0", "version": "1.3.0",
"port-version": 1,
"description": "Modern web framework.", "description": "Modern web framework.",
"homepage": "https://github.com/oatpp/oatpp", "homepage": "https://github.com/oatpp/oatpp",
"license": "Apache-2.0",
"dependencies": [ "dependencies": [
{ {
"name": "vcpkg-cmake", "name": "vcpkg-cmake",

20
versions/baseline.json
View File

@ -5026,19 +5026,19 @@
}, },
"oatpp": { "oatpp": {
"baseline": "1.3.0", "baseline": "1.3.0",
"port-version": 0 "port-version": 1
}, },
"oatpp-consul": { "oatpp-consul": {
"baseline": "1.3.0", "baseline": "1.3.0",
"port-version": 0 "port-version": 1
}, },
"oatpp-curl": { "oatpp-curl": {
"baseline": "1.3.0", "baseline": "1.3.0",
"port-version": 0 "port-version": 1
}, },
"oatpp-libressl": { "oatpp-libressl": {
"baseline": "1.3.0", "baseline": "1.3.0",
"port-version": 0 "port-version": 1
}, },
"oatpp-mbedtls": { "oatpp-mbedtls": {
"baseline": "1.3.0", "baseline": "1.3.0",
@ -5046,7 +5046,7 @@
}, },
"oatpp-mongo": { "oatpp-mongo": {
"baseline": "1.3.0", "baseline": "1.3.0",
"port-version": 0 "port-version": 1
}, },
"oatpp-openssl": { "oatpp-openssl": {
"baseline": "1.3.0", "baseline": "1.3.0",
@ -5054,19 +5054,19 @@
}, },
"oatpp-postgresql": { "oatpp-postgresql": {
"baseline": "1.3.0", "baseline": "1.3.0",
"port-version": 0 "port-version": 1
}, },
"oatpp-sqlite": { "oatpp-sqlite": {
"baseline": "1.3.0", "baseline": "1.3.0",
"port-version": 0 "port-version": 1
}, },
"oatpp-ssdp": { "oatpp-ssdp": {
"baseline": "1.3.0", "baseline": "1.3.0",
"port-version": 0 "port-version": 1
}, },
"oatpp-swagger": { "oatpp-swagger": {
"baseline": "1.3.0", "baseline": "1.3.0",
"port-version": 0 "port-version": 1
}, },
"oatpp-websocket": { "oatpp-websocket": {
"baseline": "1.3.0", "baseline": "1.3.0",
@ -5074,7 +5074,7 @@
}, },
"oatpp-zlib": { "oatpp-zlib": {
"baseline": "1.3.0", "baseline": "1.3.0",
"port-version": 0 "port-version": 1
}, },
"observer-ptr-lite": { "observer-ptr-lite": {
"baseline": "0.4.0", "baseline": "0.4.0",

5
versions/o-/oatpp-consul.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "cbf60e5cb055ff29081126e61debb330651a24fd",
"version": "1.3.0",
"port-version": 1
},
{ {
"git-tree": "a7dbba8dd8a15ee5a573d8893af3755c2c61e082", "git-tree": "a7dbba8dd8a15ee5a573d8893af3755c2c61e082",
"version": "1.3.0", "version": "1.3.0",

5
versions/o-/oatpp-curl.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "ca3da373f9eca04129ab53c726e00678b7727a6e",
"version": "1.3.0",
"port-version": 1
},
{ {
"git-tree": "ae678502914406793d56adb1bffbede8febdfb77", "git-tree": "ae678502914406793d56adb1bffbede8febdfb77",
"version": "1.3.0", "version": "1.3.0",

5
versions/o-/oatpp-libressl.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "c52fe5660b4e58aa5782ccd3a43e5298f4225fe1",
"version": "1.3.0",
"port-version": 1
},
{ {
"git-tree": "9a94780d515079c88f644ac92b35f935fff138b5", "git-tree": "9a94780d515079c88f644ac92b35f935fff138b5",
"version": "1.3.0", "version": "1.3.0",

5
versions/o-/oatpp-mongo.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "0e9c046ae1943591d58c8e48aee697a0e7718f8d",
"version": "1.3.0",
"port-version": 1
},
{ {
"git-tree": "bb2cca9b0d5255e9c250210b6da94b8383673530", "git-tree": "bb2cca9b0d5255e9c250210b6da94b8383673530",
"version": "1.3.0", "version": "1.3.0",

5
versions/o-/oatpp-postgresql.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "8d182a4a2fa22b5a9da9b16eca3a37d7bdb74b44",
"version": "1.3.0",
"port-version": 1
},
{ {
"git-tree": "f5475ec4475805e185290f9b6676cb0b3471d469", "git-tree": "f5475ec4475805e185290f9b6676cb0b3471d469",
"version": "1.3.0", "version": "1.3.0",

5
versions/o-/oatpp-sqlite.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "b28e241610e463b41e9c3e3f16f5805b19fb5fa5",
"version": "1.3.0",
"port-version": 1
},
{ {
"git-tree": "83864d8dac636388be925bc5228fb6067ff0c634", "git-tree": "83864d8dac636388be925bc5228fb6067ff0c634",
"version": "1.3.0", "version": "1.3.0",

5
versions/o-/oatpp-ssdp.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "7f3fb7a485473cfc812dbd4fbc93c291db75aeea",
"version": "1.3.0",
"port-version": 1
},
{ {
"git-tree": "37d034f06503445f5a4ac52a960f4360cb68ce58", "git-tree": "37d034f06503445f5a4ac52a960f4360cb68ce58",
"version": "1.3.0", "version": "1.3.0",

5
versions/o-/oatpp-swagger.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "b8935367b57b4203e0eba828a6b8f9cc5ebb659c",
"version": "1.3.0",
"port-version": 1
},
{ {
"git-tree": "4f0bc8c1d3f156e6d2a7cee4691154c0973b12bd", "git-tree": "4f0bc8c1d3f156e6d2a7cee4691154c0973b12bd",
"version": "1.3.0", "version": "1.3.0",

5
versions/o-/oatpp-zlib.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "0f40812d2446d50d41add9deba46e0baa042ac53",
"version": "1.3.0",
"port-version": 1
},
{ {
"git-tree": "74e51d02fac6e71c8bad4856fc97767f8d3041ea", "git-tree": "74e51d02fac6e71c8bad4856fc97767f8d3041ea",
"version": "1.3.0", "version": "1.3.0",

5
versions/o-/oatpp.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "f3700f7d93bbb8922878c25705d0e00cd7049066",
"version": "1.3.0",
"port-version": 1
},
{ {
"git-tree": "85f50043f867de15e428b3d0f8749a5aabc34e86", "git-tree": "85f50043f867de15e428b3d0f8749a5aabc34e86",
"version": "1.3.0", "version": "1.3.0",