diff options
| -rw-r--r-- | cmake/compiler/clang/settings.cmake | 5 | ||||
| -rw-r--r-- | cmake/compiler/gcc/settings.cmake | 5 | ||||
| -rw-r--r-- | cmake/compiler/msvc/settings.cmake | 10 | ||||
| -rw-r--r-- | cmake/macros/ConfigureBaseTargets.cmake | 5 | ||||
| -rw-r--r-- | cmake/platform/unix/settings.cmake | 4 |
5 files changed, 5 insertions, 24 deletions
diff --git a/cmake/compiler/clang/settings.cmake b/cmake/compiler/clang/settings.cmake index eec7bf581a7..39a1ba672d4 100644 --- a/cmake/compiler/clang/settings.cmake +++ b/cmake/compiler/clang/settings.cmake @@ -1,8 +1,3 @@ -# Set build-directive (used in core to tell which buildtype we used) -target_compile_definitions(trinity-compile-option-interface - INTERFACE - -D_BUILD_DIRECTIVE="$<CONFIG>") - set(CLANG_EXPECTED_VERSION 11.0.0) if(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang") # apple doesnt like to do the sane thing which would be to use the same version numbering as regular clang diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake index 99417c1fbf9..e830d28b655 100644 --- a/cmake/compiler/gcc/settings.cmake +++ b/cmake/compiler/gcc/settings.cmake @@ -1,8 +1,3 @@ -# Set build-directive (used in core to tell which buildtype we used) -target_compile_definitions(trinity-compile-option-interface - INTERFACE - -D_BUILD_DIRECTIVE="$<CONFIG>") - set(GCC_EXPECTED_VERSION 11.1.0) if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS GCC_EXPECTED_VERSION) diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index 83df3685037..16edd7e3c19 100644 --- a/cmake/compiler/msvc/settings.cmake +++ b/cmake/compiler/msvc/settings.cmake @@ -59,23 +59,13 @@ else() message(STATUS "MSVC: Disabled Safe Exception Handlers for debug builds") endif() -# Set build-directive (used in core to tell which buildtype we used) # 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(trinity-compile-option-interface - INTERFACE - -D_BUILD_DIRECTIVE="$(ConfigurationName)") - # multithreaded compiling on VS target_compile_options(trinity-compile-option-interface INTERFACE /MP) else() - # while all make-like generators do (nmake, ninja) - target_compile_definitions(trinity-compile-option-interface - INTERFACE - -D_BUILD_DIRECTIVE="$<CONFIG>") - # Forces writes to the PDB file to be serialized through mspdbsrv.exe (/FS) # Enable faster PDB generation in parallel builds by minimizing RPC calls to mspdbsrv.exe (/Zf) target_compile_options(trinity-compile-option-interface diff --git a/cmake/macros/ConfigureBaseTargets.cmake b/cmake/macros/ConfigureBaseTargets.cmake index b9bcaffd7d2..34ed3170044 100644 --- a/cmake/macros/ConfigureBaseTargets.cmake +++ b/cmake/macros/ConfigureBaseTargets.cmake @@ -15,6 +15,11 @@ add_library(trinity-compile-option-interface INTERFACE) set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_STANDARD 20) +# Set build-directive (used in core to tell which buildtype we used) +target_compile_definitions(trinity-compile-option-interface + INTERFACE + -D_BUILD_DIRECTIVE="$<CONFIG>") + # An interface library to make the target features available to other targets add_library(trinity-feature-interface INTERFACE) diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake index 846742906b0..2dd8197e293 100644 --- a/cmake/platform/unix/settings.cmake +++ b/cmake/platform/unix/settings.cmake @@ -52,8 +52,4 @@ elseif(CMAKE_C_COMPILER MATCHES "icc") include(${CMAKE_SOURCE_DIR}/cmake/compiler/icc/settings.cmake) elseif(CMAKE_C_COMPILER MATCHES "clang" OR CMAKE_C_COMPILER_ID MATCHES "Clang") include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake) -else() - target_compile_definitions(trinity-compile-option-interface - INTERFACE - -D_BUILD_DIRECTIVE="${CMAKE_BUILD_TYPE}") endif() |