Skip to content

Commit 97b1a9b

Browse files
committed
cmake: no -Werror on the C++ code we copy from llvm
1 parent ce20ebb commit 97b1a9b

File tree

1 file changed

+9
-36
lines changed

1 file changed

+9
-36
lines changed

CMakeLists.txt

Lines changed: 9 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -654,46 +654,19 @@ include_directories(
654654
"${CMAKE_SOURCE_DIR}/src"
655655
)
656656

657-
# These have to go before the -Wno- flags
658657
if(MSVC)
659658
set(EXE_CXX_FLAGS "/std:c++14")
660-
else(MSVC)
661-
set(EXE_CXX_FLAGS "-std=c++14")
662-
endif(MSVC)
663-
664-
if("${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()
678-
endif()
679-
680-
if(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()
682663
else()
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()
687-
endif()
688-
689-
set(EXE_LDFLAGS " ")
690-
if(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()
695-
elseif(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()
697670
endif()
698671

699672
if(ZIG_STATIC)

0 commit comments

Comments
 (0)