Merge remote-tracking branch 'origin/feature/c-flags-fix' into release/v0.6

Author: MrPointer

cmake/Platform/Libraries/LibraryFlagsManager.cmake

@@ -9,11 +9,9 @@ function(set_library_flags _library_target _board_id)
     parse_scope_argument(scope "${ARGN}"
             DEFAULT_SCOPE PUBLIC)
 
-    # Set C++ compiler flags
-    get_cmake_compliant_language_name(cpp flags_language)
-    set_compiler_target_flags(${_library_target} "${_board_id}" ${scope} LANGUAGE ${flags_language})
+    set_compiler_target_flags(${_library_target} ${_board_id} ${scope})
 
     # Set linker flags
-    set_linker_flags(${_library_target} "${_board_id}")
+    set_linker_flags(${_library_target} ${_board_id})
 
 endfunction()

cmake/Platform/Other/TargetFlagsManager.cmake

@@ -1,3 +1,20 @@
+#=============================================================================#
+# Sets compiler flags on the given target using the given board ID, compiler language and scope.
+#       _target_name - Name of the target (Executable or Library) to set flags on.
+#       _board_id - Target's bounded board ID.
+#       _language - Language for which flags are set (such as C/C++).
+#       _scope - Flags' scope relative to outer targets (targets using the given target).
+#=============================================================================#
+function(_set_target_language_flags _target_name _board_id _language _scope)
+
+    parse_compiler_recipe_flags(${_board_id} compiler_recipe_flags
+            LANGUAGE "${_language}")
+
+    target_compile_options(${_target_name} ${_scope}
+            $<$<COMPILE_LANGUAGE:${_language}>:${compiler_recipe_flags}>)
+
+endfunction()
+
 #=============================================================================#
 # Sets compiler flags on the given target, according also to the given board ID.
 #       _target_name - Name of the target (Executable or Library) to set flags on.
@@ -10,18 +27,18 @@ function(set_compiler_target_flags _target_name _board_id)
             DEFAULT_SCOPE PUBLIC)
 
     if (parsed_args_LANGUAGE)
+        _set_target_language_flags(${_target_name} ${_board_id} ${parsed_args_LANGUAGE} ${scope})
 
-        parse_compiler_recipe_flags("${_board_id}" compiler_recipe_flags
-                LANGUAGE "${parsed_args_LANGUAGE}")
-
-        target_compile_options(${_target_name} ${scope}
-                $<$<COMPILE_LANGUAGE:${parsed_args_LANGUAGE}>:${compiler_recipe_flags}>)
+    else () # No specific language requested - Use all
 
-    else ()
+        get_cmake_compliant_language_name(asm lang)
+        _set_target_language_flags(${_target_name} ${_board_id} ${lang} ${scope})
 
-        parse_compiler_recipe_flags("${_board_id}" compiler_recipe_flags)
+        get_cmake_compliant_language_name(c lang)
+        _set_target_language_flags(${_target_name} ${_board_id} ${lang} ${scope})
 
-        target_compile_options(${_target_name} ${scope} ${compiler_recipe_flags})
+        get_cmake_compliant_language_name(cpp lang)
+        _set_target_language_flags(${_target_name} ${_board_id} ${lang} ${scope})
 
     endif ()
 

cmake/Platform/Targets/CoreLibTarget.cmake

@@ -64,21 +64,10 @@ endfunction()
 #=============================================================================#
 function(_set_core_lib_flags _core_target_name _board_id)
 
-    # Set Assembly compiler flags
-    get_cmake_compliant_language_name(asm flags_language)
-    set_compiler_target_flags(${_core_target_name} "${_board_id}" PRIVATE
-            LANGUAGE ${flags_language})
-    # Set C compiler flags
-    get_cmake_compliant_language_name(c flags_language)
-    set_compiler_target_flags(${_core_target_name} "${_board_id}" PRIVATE
-            LANGUAGE ${flags_language})
-    # Set C++ compiler flags
-    get_cmake_compliant_language_name(cpp flags_language)
-    set_compiler_target_flags(${_core_target_name} "${_board_id}" PRIVATE
-            LANGUAGE ${flags_language})
+    set_compiler_target_flags(${_core_target_name} ${_board_id} PUBLIC)
 
     # Set linker flags
-    set_linker_flags(${_core_target_name} "${_board_id}")
+    set_linker_flags(${_core_target_name} ${_board_id})
 
 endfunction()