From c15d7211dd2b4f998395a3eec013212150a9187f Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=B0=95=EC=84=B8=ED=9D=AC/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Principal=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Thu, 19 Jul 2018 18:42:40 +0900 Subject: [PATCH] Tidy cmake, separate apply compilation flags (#2014) This will extract compilation flag setting code to separate file Signed-off-by: SaeHie Park --- CMakeLists.txt | 18 +++--------------- cmake/ApplyCompileFlags.cmake | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 cmake/ApplyCompileFlags.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 1fc340b..efec620 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,21 +14,9 @@ include("cmake/option/identify_platform.cmake") # platform specific options include("cmake/option/option_${TARGET_PLATFORM}.cmake") -# add common flags -foreach(FLAG ${FLAGS_COMMON}) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAG}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAG}") -endforeach() - -# add c flags -foreach(FLAG ${FLAGS_CONLY}) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAG}") -endforeach() - -# add cxx flags -foreach(FLAG ${FLAGS_CXXONLY}) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAG}") -endforeach() +# apply compilation flags +# note: this should be placed after cmake/option/option_xxx.cmake files +include("cmake/ApplyCompileFlags.cmake") # Configuration flags include("cmake/CfgOptionFlags.cmake") diff --git a/cmake/ApplyCompileFlags.cmake b/cmake/ApplyCompileFlags.cmake new file mode 100644 index 0000000..e2124bb --- /dev/null +++ b/cmake/ApplyCompileFlags.cmake @@ -0,0 +1,15 @@ +# add common flags +foreach(FLAG ${FLAGS_COMMON}) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAG}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAG}") +endforeach() + +# add c flags +foreach(FLAG ${FLAGS_CONLY}) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAG}") +endforeach() + +# add cxx flags +foreach(FLAG ${FLAGS_CXXONLY}) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAG}") +endforeach() -- 2.7.4