dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use COMPILE_LANGUAGE when setting compile options

Browse Source
This commit is contained in:
Jonas Kvinge
2020-04-24 00:01:59 +02:00
parent e62ab23de2
commit 7a56ffb7c3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -32,7 +32,8 @@ set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
list(APPEND COMPILE_OPTIONS list(APPEND COMPILE_OPTIONS
--std=c++11 $<$<COMPILE_LANGUAGE:C>:--std=c99>
$<$<COMPILE_LANGUAGE:CXX>:--std=c++11>
-U__STRICT_ANSI__ -U__STRICT_ANSI__
-Wall -Wall
-Wextra -Wextra
@@ -44,7 +45,6 @@ list(APPEND COMPILE_OPTIONS
-Wredundant-decls -Wredundant-decls
-Wcast-align -Wcast-align
-Winit-self -Winit-self
-Woverloaded-virtual
-Wmissing-include-dirs -Wmissing-include-dirs
-Wmissing-declarations -Wmissing-declarations
-Wstrict-overflow=2 -Wstrict-overflow=2
@@ -52,8 +52,9 @@ list(APPEND COMPILE_OPTIONS
-Wformat=2 -Wformat=2
-Wdisabled-optimization -Wdisabled-optimization
-Wno-sign-conversion -Wno-sign-conversion
-Wno-old-style-cast $<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual>
-fpermissive $<$<COMPILE_LANGUAGE:CXX>:-Wno-old-style-cast>
$<$<COMPILE_LANGUAGE:CXX>:-fpermissive>
) )
if(APPLE) if(APPLE)
@@ -65,7 +66,6 @@ if(BUILD_WERROR)
list(APPEND COMPILE_OPTIONS -Werror) list(APPEND COMPILE_OPTIONS -Werror)
endif(BUILD_WERROR) endif(BUILD_WERROR)
message(STATUS "COMPILE_OPTIONS: ${COMPILE_OPTIONS}")
add_compile_options(${COMPILE_OPTIONS}) add_compile_options(${COMPILE_OPTIONS})
if(${CMAKE_BUILD_TYPE} MATCHES "Release") if(${CMAKE_BUILD_TYPE} MATCHES "Release")