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

[filament] require C++-17

Browse Source
This commit is contained in:
Amin Yahyaabadi 2024-11-07 01:00:07 -08:00
parent 8698aacb32
commit b60ae89e88
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ports/filament/0000-compiler.patch
View File

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5180bdfb6..08a065c07 100644 index 5180bdfb6..471ce49ed 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -264,6 +264,9 @@ set(TOOLS ${CMAKE_CURRENT_SOURCE_DIR}/tools) @@ -264,6 +264,9 @@ set(TOOLS ${CMAKE_CURRENT_SOURCE_DIR}/tools)
@ -20,19 +20,29 @@ index 5180bdfb6..08a065c07 100644
# ================================================================================================== # ==================================================================================================
# Link time optimizations (LTO) # Link time optimizations (LTO)
@@ -315,7 +319,10 @@ if (MSVC) @@ -306,16 +310,16 @@ endif()
# ==================================================================================================
# General compiler flags
# ==================================================================================================
-set(CXX_STANDARD "-std=c++17")
-if (WIN32)
- set(CXX_STANDARD "/std:c++17")
-endif()
+set(CMAKE_CXX_STANDARD 17)
if (MSVC)
set(CXX_STANDARD "/std:c++latest") set(CXX_STANDARD "/std:c++latest")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_STANDARD} /W0 /Zc:__cplusplus") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_STANDARD} /W0 /Zc:__cplusplus")
else() else()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_STANDARD} -fstrict-aliasing -Wno-unknown-pragmas -Wno-unused-function -Wno-deprecated-declarations") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_STANDARD} -fstrict-aliasing -Wno-unknown-pragmas -Wno-unused-function -Wno-deprecated-declarations")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_STANDARD} -Wno-unknown-pragmas -Wno-unused-function -Wno-deprecated-declarations") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas -Wno-unused-function -Wno-deprecated-declarations")
+ if(CMAKE_CXX_COMPILER_ID STREQUAL Clang OR CMAKE_CXX_COMPILER_ID STREQUAL AppleClang) + if(CMAKE_CXX_COMPILER_ID STREQUAL Clang OR CMAKE_CXX_COMPILER_ID STREQUAL AppleClang)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstrict-aliasing") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstrict-aliasing")
+ endif() + endif()
endif() endif()
if (FILAMENT_USE_EXTERNAL_GLES3) if (FILAMENT_USE_EXTERNAL_GLES3)
@@ -361,10 +368,18 @@ if (MSVC) @@ -361,10 +365,18 @@ if (MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE")
endif() endif()

2
versions/f-/filament.json
View File

@ -1,7 +1,7 @@
{ {
"versions": [ "versions": [
{ {
"git-tree": "33d488f2213065cb4e8de3acb65bf14d6944c44a", "git-tree": "0e0fb8d54d9e49edda9fcb41d21ed7a2171cfa87",
"version-semver": "1.55.0", "version-semver": "1.55.0",
"port-version": 0 "port-version": 0
} }