authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-01-26 12:22:39-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-01-26 20:13:27-05:00
log97b1a9bb6bcf1b293c3da5e3a3bfd829016c0e85
tree4b392ddd5c4b469a87775a13f8692e6a7597f4ee
parentce20ebb50c216b67b40c80915c9ebd409afa05db

cmake: no -Werror on the C++ code we copy from llvm

1 files changed, 9 insertions(+), 36 deletions(-)

CMakeLists.txt+9-36
......@@ -654,46 +654,19 @@ include_directories(
654654 "${CMAKE_SOURCE_DIR}/src"
655655)
656656
657# These have to go before the -Wno- flags
658657if(MSVC)
659658 set(EXE_CXX_FLAGS "/std:c++14")
660else(MSVC)
661 set(EXE_CXX_FLAGS "-std=c++14")
662endif(MSVC)
663
664if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
665 if(MSVC)
666 set(EXE_CXX_FLAGS "${EXE_CXX_FLAGS} /w")
667 else()
668 set(EXE_CXX_FLAGS "${EXE_CXX_FLAGS} -Werror -Wall")
669 # fallthrough support was added in GCC 7.0
670 if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 7.0)
671 set(EXE_CXX_FLAGS "${EXE_CXX_FLAGS} -Werror=implicit-fallthrough")
672 endif()
673 # GCC 9.2 and older are unable to detect valid variable initialization in some cases
674 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 9.2)
675 set(EXE_CXX_FLAGS "${EXE_CXX_FLAGS} -Wno-maybe-uninitialized")
676 endif()
677 endif()
678endif()
679
680if(MSVC)
681 set(EXE_CXX_FLAGS "${EXE_CXX_FLAGS}")
659 set(EXE_LDFLAGS "/STACK:16777216")
660 if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "MinSizeRel")
661 set(EXE_LDFLAGS "${EXE_LDFLAGS} /debug:fastlink")
662 endif()
682663else()
683 set(EXE_CXX_FLAGS "${EXE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D_GNU_SOURCE -fvisibility-inlines-hidden -fno-exceptions -fno-rtti -Werror=type-limits -Wno-missing-braces -Wno-comment")
684 if(MINGW)
685 set(EXE_CXX_FLAGS "${EXE_CXX_FLAGS} -Wno-format")
686 endif()
687endif()
688
689set(EXE_LDFLAGS " ")
690if(MSVC)
691 set(EXE_LDFLAGS "${EXE_LDFLAGS} /STACK:16777216")
692 if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "MinSizeRel")
693 set(EXE_LDFLAGS "${EXE_LDFLAGS} /debug:fastlink")
694 endif()
695elseif(MINGW)
664 set(EXE_CXX_FLAGS "-std=c++14 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D_GNU_SOURCE -fvisibility-inlines-hidden -fno-exceptions -fno-rtti -Werror=type-limits -Wno-missing-braces -Wno-comment")
665 set(EXE_LDFLAGS " ")
666 if(MINGW)
667 set(EXE_CXX_FLAGS "${EXE_CXX_FLAGS} -Wno-format")
696668 set(EXE_LDFLAGS "${EXE_LDFLAGS} -Wl,--stack,16777216")
669 endif()
697670endif()
698671
699672if(ZIG_STATIC)