From 9f59045546ff184701cf5b6a7c244dd14197b9eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C3=B8e?= <sebastian.boe@nordicsemi.no>
Date: Fri, 10 Nov 2017 12:22:23 +0100
Subject: [PATCH] cmake: Refactored EXTRA_FLAGS code into a dedicated script

Signed-off-by: Sebastian Boe <sebastian.boe@nordicsemi.no>
---
 CMakeLists.txt          | 29 +----------------------------
 cmake/extra_flags.cmake | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 28 deletions(-)
 create mode 100644 cmake/extra_flags.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30dd6f71723..b994ca6de00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -180,34 +180,7 @@ endif()
 
 # Allow the user to inject options when calling cmake, e.g.
 # 'cmake -DEXTRA_CFLAGS="-Werror -Wno-deprecated-declarations" ..'
-
-separate_arguments(EXTRA_CPPFLAGS_AS_LIST UNIX_COMMAND ${EXTRA_CPPFLAGS})
-separate_arguments(EXTRA_LD_FLAGS_AS_LIST UNIX_COMMAND ${EXTRA_LD_FLAGS})
-separate_arguments(EXTRA_CFLAGS_AS_LIST   UNIX_COMMAND ${EXTRA_CFLAGS})
-separate_arguments(EXTRA_CXXFLAGS_AS_LIST UNIX_COMMAND ${EXTRA_CXXFLAGS})
-separate_arguments(EXTRA_AFLAGS_AS_LIST   UNIX_COMMAND ${EXTRA_AFLAGS})
-
-if(EXTRA_CPPFLAGS)
-  zephyr_compile_definitions(${EXTRA_CPPFLAGS_AS_LIST})
-endif()
-if(EXTRA_LDFLAGS)
-  zephyr_link_libraries(${EXTRA_LDFLAGS_AS_LIST})
-endif()
-if(EXTRA_CFLAGS)
-  foreach(F ${EXTRA_CFLAGS_AS_LIST})
-    zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:${F}>)
-  endforeach()
-endif()
-if(EXTRA_CXXFLAGS)
-  foreach(F ${EXTRA_CXXFLAGS_AS_LIST})
-    zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:${F}>)
-  endforeach()
-endif()
-if(EXTRA_AFLAGS)
-  foreach(F ${EXTRA_AFLAGS_AS_LIST})
-    zephyr_compile_options($<$<COMPILE_LANGUAGE:ASM>:${F}>)
-  endforeach()
-endif()
+include(cmake/extra_flags.cmake)
 
 if(CONFIG_READABLE_ASM)
   zephyr_cc_option(-fno-reorder-blocks)
diff --git a/cmake/extra_flags.cmake b/cmake/extra_flags.cmake
new file mode 100644
index 00000000000..b1f99905d92
--- /dev/null
+++ b/cmake/extra_flags.cmake
@@ -0,0 +1,28 @@
+separate_arguments(EXTRA_CPPFLAGS_AS_LIST UNIX_COMMAND ${EXTRA_CPPFLAGS})
+separate_arguments(EXTRA_LD_FLAGS_AS_LIST UNIX_COMMAND ${EXTRA_LD_FLAGS})
+separate_arguments(EXTRA_CFLAGS_AS_LIST   UNIX_COMMAND ${EXTRA_CFLAGS})
+separate_arguments(EXTRA_CXXFLAGS_AS_LIST UNIX_COMMAND ${EXTRA_CXXFLAGS})
+separate_arguments(EXTRA_AFLAGS_AS_LIST   UNIX_COMMAND ${EXTRA_AFLAGS})
+
+if(EXTRA_CPPFLAGS)
+  zephyr_compile_definitions(${EXTRA_CPPFLAGS_AS_LIST})
+endif()
+if(EXTRA_LDFLAGS)
+  zephyr_link_libraries(${EXTRA_LDFLAGS_AS_LIST})
+endif()
+if(EXTRA_CFLAGS)
+  foreach(F ${EXTRA_CFLAGS_AS_LIST})
+    zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:${F}>)
+  endforeach()
+endif()
+if(EXTRA_CXXFLAGS)
+  foreach(F ${EXTRA_CXXFLAGS_AS_LIST})
+    zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:${F}>)
+  endforeach()
+endif()
+if(EXTRA_AFLAGS)
+  foreach(F ${EXTRA_AFLAGS_AS_LIST})
+    zephyr_compile_options($<$<COMPILE_LANGUAGE:ASM>:${F}>)
+  endforeach()
+endif()
+