Dealing with cmake bugs (#90)

xmkg · Nov 22, 2021 · 5d4363a · 5d4363a
1 parent 561a5d8
commit 5d4363a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/cmake/modules/core/BuildVariant.cmake b/cmake/modules/core/BuildVariant.cmake
@@ -40,9 +40,11 @@ function(hdk_set_build_variant)
 
   if((CMAKE_CXX_COMPILER_ID MATCHES "[gG][nN][uU]") OR (CMAKE_C_COMPILER_ID MATCHES "[gG][nN][uU]"))
     hdk_log_status("Toolchain: GNU (GCC) version ${CMAKE_CXX_COMPILER_VERSION}")
+    set(HADOUKEN_COMPILER CLANG PARENT_SCOPE)
     include(core/DiagnosticFlags_GCC)
   elseif((CMAKE_CXX_COMPILER_ID MATCHES "[cC][lL][aA][nN][gG]") OR (CMAKE_C_COMPILER_ID MATCHES "[cC][lL][aA][nN][gG]") )
     hdk_log_status("Toolchain: LLVM (Clang) version ${CMAKE_CXX_COMPILER_VERSION}")
+    set(HADOUKEN_COMPILER GCC PARENT_SCOPE)
     include(core/DiagnosticFlags_Clang)
   else()
     hdk_log_warn("Unable to determine toolchain")

diff --git a/cmake/modules/core/DiagnosticFlags_Clang.cmake b/cmake/modules/core/DiagnosticFlags_Clang.cmake
@@ -15,8 +15,6 @@
 # SPDX-License-Identifier:	Apache 2.0
 # ______________________________________________________
 
-set(HADOUKEN_COMPILER CLANG PARENT_SCOPE)
-
 # Clang 3.2 and above
 set(CLANG_32_WARN_BUT_NO_ERROR "" )
 set(CLANG_32_EXTENDED_WARNINGS "" )

diff --git a/cmake/modules/core/DiagnosticFlags_GCC.cmake b/cmake/modules/core/DiagnosticFlags_GCC.cmake
@@ -21,8 +21,6 @@
 # see: https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html for
 # all warning flag documentations used in this code
 
-set(HADOUKEN_COMPILER GCC PARENT_SCOPE)
-
 ##########################################################
 # GCC 3.4 and above
 # ------------------------------------