mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
49 lines
2.3 KiB
Diff
49 lines
2.3 KiB
Diff
--- CMakeLists.txt.orig 2016-08-25 00:59:05.000000000 -0700
|
|
+++ CMakeLists.txt 2019-12-15 23:53:54.000000000 -0700
|
|
@@ -50,7 +50,7 @@
|
|
endif(CCACHE_FOUND)
|
|
|
|
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Werror")
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
|
if (RAPIDJSON_BUILD_CXX11)
|
|
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7.0")
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
|
|
@@ -73,7 +73,7 @@
|
|
endif()
|
|
endif()
|
|
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Werror -Wno-missing-field-initializers")
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
|
if (RAPIDJSON_BUILD_CXX11)
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
|
endif()
|
|
--- example/CMakeLists.txt.orig 2016-08-25 00:59:05.000000000 -0700
|
|
+++ example/CMakeLists.txt 2019-12-16 00:02:42.000000000 -0700
|
|
@@ -26,9 +26,9 @@
|
|
add_definitions(-D__STDC_FORMAT_MACROS)
|
|
|
|
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -Werror -Wall -Wextra -Weffc++ -Wswitch-default")
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
|
|
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Weffc++ -Wswitch-default -Wfloat-equal -Wimplicit-fallthrough -Weverything")
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
|
endif()
|
|
|
|
foreach (example ${EXAMPLES})
|
|
--- test/unittest/CMakeLists.txt.orig 2016-08-25 00:59:05.000000000 -0700
|
|
+++ test/unittest/CMakeLists.txt 2019-12-16 00:16:28.000000000 -0700
|
|
@@ -37,9 +37,9 @@
|
|
endif(CCACHE_FOUND)
|
|
|
|
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Weffc++ -Wswitch-default -Wfloat-equal")
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
|
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Weffc++ -Wswitch-default -Wfloat-equal -Wimplicit-fallthrough -Weverything")
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
|
# If the user is running a newer version of Clang that includes the
|
|
# -Wdouble-promotion, we will ignore that warning.
|
|
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.7)
|