diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-04-16 17:53:36 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-04-16 17:53:36 +0200 |
| commit | 369b618d4f160816818681ed7e41063e2d9ba5b5 (patch) | |
| tree | 228bb8f6460b5b0d8e0d83811a54e510dc98e91a /cmake/compiler | |
| parent | 01c68b2aa2ed25ea9b4c007f238a0e958f6525b1 (diff) | |
Build system: Support new in cmake 3.17 Ninja Multi-Config generator
Diffstat (limited to 'cmake/compiler')
| -rw-r--r-- | cmake/compiler/clang/settings.cmake | 2 | ||||
| -rw-r--r-- | cmake/compiler/gcc/settings.cmake | 2 | ||||
| -rw-r--r-- | cmake/compiler/icc/settings.cmake | 2 | ||||
| -rw-r--r-- | cmake/compiler/mingw/settings.cmake | 2 | ||||
| -rw-r--r-- | cmake/compiler/msvc/settings.cmake | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/cmake/compiler/clang/settings.cmake b/cmake/compiler/clang/settings.cmake index fd690d2405b..d42345541ee 100644 --- a/cmake/compiler/clang/settings.cmake +++ b/cmake/compiler/clang/settings.cmake @@ -1,7 +1,7 @@ # Set build-directive (used in core to tell which buildtype we used) target_compile_definitions(trinity-compile-option-interface INTERFACE - -D_BUILD_DIRECTIVE="${CMAKE_BUILD_TYPE}") + -D_BUILD_DIRECTIVE="$<CONFIG>") if(WITH_WARNINGS) target_compile_options(trinity-warning-interface diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake index 9139a028f18..f827f53b3de 100644 --- a/cmake/compiler/gcc/settings.cmake +++ b/cmake/compiler/gcc/settings.cmake @@ -1,7 +1,7 @@ # Set build-directive (used in core to tell which buildtype we used) target_compile_definitions(trinity-compile-option-interface INTERFACE - -D_BUILD_DIRECTIVE="${CMAKE_BUILD_TYPE}") + -D_BUILD_DIRECTIVE="$<CONFIG>") set(GCC_EXPECTED_VERSION 6.3.0) diff --git a/cmake/compiler/icc/settings.cmake b/cmake/compiler/icc/settings.cmake index 563b92d6b9b..fd591440355 100644 --- a/cmake/compiler/icc/settings.cmake +++ b/cmake/compiler/icc/settings.cmake @@ -1,6 +1,6 @@ target_compile_definitions(trinity-compile-option-interface INTERFACE - -D_BUILD_DIRECTIVE="${CMAKE_BUILD_TYPE}") + -D_BUILD_DIRECTIVE="$<CONFIG>") if(PLATFORM EQUAL 32) target_compile_options(trinity-compile-option-interface diff --git a/cmake/compiler/mingw/settings.cmake b/cmake/compiler/mingw/settings.cmake index e3c75581648..0268de93ff5 100644 --- a/cmake/compiler/mingw/settings.cmake +++ b/cmake/compiler/mingw/settings.cmake @@ -4,7 +4,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) # Set build-directive (used in core to tell which buildtype we used) target_compile_definitions(trinity-compile-option-interface INTERFACE - -D_BUILD_DIRECTIVE="${CMAKE_BUILD_TYPE}") + -D_BUILD_DIRECTIVE="$<CONFIG>") if(PLATFORM EQUAL 32) # Required on 32-bit systems to enable SSE2 (standard on x64) diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index 72f6176007d..5e40b5ea414 100644 --- a/cmake/compiler/msvc/settings.cmake +++ b/cmake/compiler/msvc/settings.cmake @@ -59,7 +59,7 @@ else() # while all make-like generators do (nmake, ninja) target_compile_definitions(trinity-compile-option-interface INTERFACE - -D_BUILD_DIRECTIVE="${CMAKE_BUILD_TYPE}") + -D_BUILD_DIRECTIVE="$<CONFIG>") endif() # multithreaded compiling on VS |