diff options
author | Kargatum <dowlandtop@yandex.com> | 2019-09-18 20:04:48 +0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-18 20:04:48 +0700 |
commit | 0e6c9a18f4f3f82ec431aad7101bdf58b8f5d63f (patch) | |
tree | a07b16890546f20ce671caa4cf128c70673369ed /src/cmake/compiler | |
parent | 91d62373ccfbf17381ab149b5eb31c1cdc1a5574 (diff) |
feat(Cmake/Build): Use interface targets for inheriting flags and definitions (#2255)
Co-authored-by: Naios Naios@users.noreply.github.com
Diffstat (limited to 'src/cmake/compiler')
-rw-r--r-- | src/cmake/compiler/clang/settings.cmake | 36 | ||||
-rw-r--r-- | src/cmake/compiler/gcc/settings.cmake | 45 | ||||
-rw-r--r-- | src/cmake/compiler/icc/settings.cmake | 29 | ||||
-rw-r--r-- | src/cmake/compiler/mingw/settings.cmake | 43 | ||||
-rw-r--r-- | src/cmake/compiler/msvc/settings.cmake | 80 |
5 files changed, 173 insertions, 60 deletions
diff --git a/src/cmake/compiler/clang/settings.cmake b/src/cmake/compiler/clang/settings.cmake index 93eb334a2e..89a4648c3d 100644 --- a/src/cmake/compiler/clang/settings.cmake +++ b/src/cmake/compiler/clang/settings.cmake @@ -1,20 +1,40 @@ +# +# Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL3 v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 +# Copyright (C) 2008-2019 TrinityCore <https://www.trinitycore.org/> +# + # Set build-directive (used in core to tell which buildtype we used) -add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"') +target_compile_definitions(acore-compile-option-interface + INTERFACE + -D_BUILD_DIRECTIVE="${CMAKE_BUILD_TYPE}") if(WITH_WARNINGS) - set(WARNING_FLAGS "-W -Wall -Wextra -Winit-self -Wfatal-errors -Wno-mismatched-tags") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} -Woverloaded-virtual") + target_compile_options(acore-warning-interface + INTERFACE + -W + -Wall + -Wextra + -Winit-self + -Wfatal-errors + -Wno-mismatched-tags + -Woverloaded-virtual) message(STATUS "Clang: All warnings enabled") endif() if(WITH_COREDEBUG) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3") + target_compile_options(acore-compile-option-interface + INTERFACE + -g3) message(STATUS "Clang: Debug-flags set (-g3)") endif() # -Wno-narrowing needed to suppress a warning in g3d # -Wno-deprecated-register is needed to suppress gsoap warnings on Unix systems. -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wno-narrowing -Wno-deprecated-register") -set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG=1") +target_compile_options(acore-compile-option-interface + INTERFACE + -Wno-narrowing + -Wno-deprecated-register) + +target_compile_definitions(acore-compile-option-interface + INTERFACE + -DDEBUG=1) diff --git a/src/cmake/compiler/gcc/settings.cmake b/src/cmake/compiler/gcc/settings.cmake index 645999dcc4..2809801a6e 100644 --- a/src/cmake/compiler/gcc/settings.cmake +++ b/src/cmake/compiler/gcc/settings.cmake @@ -1,5 +1,12 @@ +# +# Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL3 v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 +# Copyright (C) 2008-2019 TrinityCore <https://www.trinitycore.org/> +# + # Set build-directive (used in core to tell which buildtype we used) -add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"') +target_compile_definitions(acore-compile-option-interface + INTERFACE + -D_BUILD_DIRECTIVE="${CMAKE_BUILD_TYPE}") set(GCC_EXPECTED_VERSION 4.8.2) @@ -7,30 +14,36 @@ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS GCC_EXPECTED_VERSION) message(FATAL_ERROR "GCC: This project requires version ${GCC_EXPECTED_VERSION} to build but found ${CMAKE_CXX_COMPILER_VERSION}") endif() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") -message(STATUS "GCC: Enabled c++17 support") - -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") -message(STATUS "GCC: Enabled C99 support") - if(PLATFORM EQUAL 32) # Required on 32-bit systems to enable SSE2 (standard on x64) - set(SSE_FLAGS "-msse2 -mfpmath=sse") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SSE_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SSE_FLAGS}") + target_compile_options(acore-compile-option-interface + INTERFACE + -msse2 + -mfpmath=sse) endif() -add_definitions(-DHAVE_SSE2 -D__SSE2__) + +target_compile_definitions(acore-compile-option-interface + INTERFACE + -DHAVE_SSE2 + -D__SSE2__) message(STATUS "GCC: SFMT enabled, SSE2 flags forced") if( WITH_WARNINGS ) - set(WARNING_FLAGS "-W -Wall -Wextra -Winit-self -Winvalid-pch -Wfatal-errors") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} -Woverloaded-virtual") + target_compile_options(acore-warning-interface + INTERFACE + -W + -Wall + -Wextra + -Winit-self + -Winvalid-pch + -Wfatal-errors + -Woverloaded-virtual) message(STATUS "GCC: All warnings enabled") endif() if( WITH_COREDEBUG ) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3") + target_compile_options(acore-compile-option-interface + INTERFACE + -g3) message(STATUS "GCC: Debug-flags set (-g3)") endif() diff --git a/src/cmake/compiler/icc/settings.cmake b/src/cmake/compiler/icc/settings.cmake index 133bc15e59..700a80da9b 100644 --- a/src/cmake/compiler/icc/settings.cmake +++ b/src/cmake/compiler/icc/settings.cmake @@ -1,18 +1,33 @@ +# +# Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL3 v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 +# Copyright (C) 2008-2019 TrinityCore <https://www.trinitycore.org/> +# + # Set build-directive (used in core to tell which buildtype we used) -add_definitions(-D_BUILD_DIRECTIVE="'${CMAKE_BUILD_TYPE}'") +target_compile_definitions(acore-compile-option-interface + INTERFACE + -D_BUILD_DIRECTIVE="${CMAKE_BUILD_TYPE}") if(PLATFORM EQUAL 32) - add_definitions(-axSSE2) + target_compile_options(acore-compile-option-interface + INTERFACE + -axSSE2) else() - add_definitions(-xSSE2) + target_compile_options(acore-compile-option-interface + INTERFACE + -xSSE2) endif() -if( WITH_WARNINGS ) - add_definitions(-w1) +if(WITH_WARNINGS) + target_compile_options(acore-warning-interface + INTERFACE + -w1) message(STATUS "ICC: All warnings enabled") endif() -if( WITH_COREDEBUG ) - add_definitions(-g) +if(WITH_COREDEBUG) + target_compile_options(acore-compile-option-interface + INTERFACE + -g) message(STATUS "ICC: Debug-flag set (-g)") endif() diff --git a/src/cmake/compiler/mingw/settings.cmake b/src/cmake/compiler/mingw/settings.cmake index 68156bd0b6..cc2d102dc9 100644 --- a/src/cmake/compiler/mingw/settings.cmake +++ b/src/cmake/compiler/mingw/settings.cmake @@ -1,27 +1,46 @@ +# +# Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL3 v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 +# Copyright (C) 2008-2019 TrinityCore <https://www.trinitycore.org/> +# + # set up output paths for executable binaries (.exe-files, and .dll-files on DLL-capable platforms) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) # Set build-directive (used in core to tell which buildtype we used) -add_definitions(-D_BUILD_DIRECTIVE=\\"${CMAKE_BUILD_TYPE}\\") +target_compile_definitions(acore-compile-option-interface + INTERFACE + -D_BUILD_DIRECTIVE="${CMAKE_BUILD_TYPE}") if(PLATFORM EQUAL 32) # Required on 32-bit systems to enable SSE2 (standard on x64) - set(SSE_FLAGS "-msse2 -mfpmath=sse") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SSE_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SSE_FLAGS}") + target_compile_options(acore-compile-option-interface + INTERFACE + -msse2 + -mfpmath=sse) endif() -add_definitions(-DHAVE_SSE2 -D__SSE2__) + +target_compile_definitions(acore-compile-option-interface + INTERFACE + -DHAVE_SSE2 + -D__SSE2__) message(STATUS "GCC: SFMT enabled, SSE2 flags forced") -if( WITH_WARNINGS ) - set(WARNING_FLAGS "-W -Wall -Wextra -Winit-self -Winvalid-pch -Wfatal-errors") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} -Woverloaded-virtual") +if(WITH_WARNINGS) + target_compile_options(acore-warning-interface + INTERFACE + -W + -Wall + -Wextra + -Winit-self + -Winvalid-pch + -Wfatal-errors + -Woverloaded-virtual) message(STATUS "GCC: All warnings enabled") endif() -if( WITH_COREDEBUG ) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3") +if(WITH_COREDEBUG) + target_compile_options(acore-compile-option-interface + INTERFACE + -g3) message(STATUS "GCC: Debug-flags set (-g3)") endif() diff --git a/src/cmake/compiler/msvc/settings.cmake b/src/cmake/compiler/msvc/settings.cmake index 2b75f2e222..499060c0b8 100644 --- a/src/cmake/compiler/msvc/settings.cmake +++ b/src/cmake/compiler/msvc/settings.cmake @@ -1,3 +1,8 @@ +# +# Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL3 v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 +# Copyright (C) 2008-2019 TrinityCore <https://www.trinitycore.org/> +# + # set up output paths for executable binaries (.exe-files, and .dll-files on DLL-capable platforms) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) @@ -5,14 +10,25 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) #set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) #set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +# CMake sets warning flags by default, however we manage it manually +# for different core and dependency targets +string(REGEX REPLACE "/W[0-4] " "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +# Search twice, once for space after /W argument, +# once for end of line as CMake regex has no \b +string(REGEX REPLACE "/W[0-4]$" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +string(REGEX REPLACE "/W[0-4] " "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") +string(REGEX REPLACE "/W[0-4]$" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") + if(PLATFORM EQUAL 64) # This definition is necessary to work around a bug with Intellisense described # here: http://tinyurl.com/2cb428. Syntax highlighting is important for proper # debugger functionality. - add_definitions("-D_WIN64") + target_compile_definitions(acore-compile-option-interface + INTERFACE + -D_WIN64) message(STATUS "MSVC: 64-bit platform, enforced -D_WIN64 parameter") - #Enable extended object support for debug compiles on X64 (not required on X86) + # Enable extended object support for debug compiles on X64 (not required on X86) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj") message(STATUS "MSVC: Enabled extended object-support for debug-compiles") else() @@ -20,40 +36,67 @@ else() set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE") message(STATUS "MSVC: Enabled large address awareness") - add_definitions(/arch:SSE2) + target_compile_options(acore-compile-option-interface + INTERFACE + /arch:SSE2) message(STATUS "MSVC: Enabled SSE2 support") endif() -message(STATUS "MSVC: Enabled ะก++17 support") -set(CMAKE_CXX_STANDARD 17) - # Set build-directive (used in core to tell which buildtype we used) -add_definitions(-D_BUILD_DIRECTIVE=\\"$(ConfigurationName)\\") +# msbuild/devenv don't set CMAKE_MAKE_PROGRAM, you can choose build type from a dropdown after generating projects +if("${CMAKE_MAKE_PROGRAM}" MATCHES "MSBuild") + target_compile_definitions(acore-compile-option-interface + INTERFACE + -D_BUILD_DIRECTIVE="$(ConfigurationName)") +else() + # while all make-like generators do (nmake, ninja) + target_compile_definitions(acore-compile-option-interface + INTERFACE + -D_BUILD_DIRECTIVE="${CMAKE_BUILD_TYPE}") +endif() # multithreaded compiling on VS -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") +target_compile_options(acore-compile-option-interface + INTERFACE + /MP) # Define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES - eliminates the warning by changing the strcpy call to strcpy_s, which prevents buffer overruns -add_definitions(-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES) +target_compile_definitions(acore-compile-option-interface + INTERFACE + -D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES) message(STATUS "MSVC: Overloaded standard names") # Ignore warnings about older, less secure functions -add_definitions(-D_CRT_SECURE_NO_WARNINGS) +target_compile_definitions(acore-compile-option-interface + INTERFACE + -D_CRT_SECURE_NO_WARNINGS) message(STATUS "MSVC: Disabled NON-SECURE warnings") -#Ignore warnings about POSIX deprecation -add_definitions(-D_CRT_NONSTDC_NO_WARNINGS) +# Ignore warnings about POSIX deprecation +target_compile_definitions(acore-compile-option-interface + INTERFACE + -D_CRT_NONSTDC_NO_WARNINGS) message(STATUS "MSVC: Disabled POSIX warnings") -#Ignore warnings about INTMAX_MAX -add_definitions(-D__STDC_LIMIT_MACROS) +# Ignore warnings about INTMAX_MAX +target_compile_definitions(acore-compile-option-interface + INTERFACE + -D__STDC_LIMIT_MACROS) message(STATUS "MSVC: Disabled INTMAX_MAX warnings") # disable warnings in Visual Studio 8 and above if not wanted if(NOT WITH_WARNINGS) if(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619") + target_compile_options(acore-warning-interface + INTERFACE + /wd4996 + /wd4355 + /wd4244 + /wd4985 + /wd4267 + /wd4619 + # /wd4512 + ) message(STATUS "MSVC: Disabled generic compiletime warnings") endif() endif() @@ -67,4 +110,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm500") # Enable and treat as errors the following warnings to easily detect virtual function signature failures: # 'function' : member function does not override any base class virtual member function # 'virtual_function' : no override available for virtual member function from base 'class'; function is hidden -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /we4263 /we4264") +target_compile_options(acore-warning-interface + INTERFACE + /we4263 + /we4264) |