From 23be253a8db87d51c25a67ffc41c452e5b8f58d5 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Mon, 27 Apr 2020 19:30:41 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BF=D0=B8=D1=81?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D1=81=20=D1=84=D0=BB=D0=B0=D0=B3=D0=B0=D0=BC=D0=B8=20=D0=BF?=
 =?UTF-8?q?=D0=BE=20=D1=83=D0=BC=D0=BE=D0=BB=D1=87=D0=B0=D0=BD=D0=B8=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMLibBuildTypes.cmake | 51 +++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 29 deletions(-)

diff --git a/CMLibBuildTypes.cmake b/CMLibBuildTypes.cmake
index d437e80..d1a8830 100644
--- a/CMLibBuildTypes.cmake
+++ b/CMLibBuildTypes.cmake
@@ -21,32 +21,24 @@ else()
   endif()
 endif()
 
+set(_gcc_debug_flags "-ggdb -fno-omit-frame-pointer")
+set(_gcc_profile_flags "-pg")
+
 if(CMAKE_BUILD_TYPE STREQUAL Profile)
   # Ключи компиляции для режима профилирования в зависимости от типа компилятора
   if(CMAKE_CXX_COMPILER_IS_Clang OR CMAKE_CXX_COMPILER_IS_GCC)
-    set(CMAKE_C_FLAGS_PROFILE ${CMAKE_C_FLAGS_RELEASE} -ggdb -pg -fno-omit-frame-pointer)
-    list(REMOVE_DUPLICATES CMAKE_C_FLAGS_PROFILE)
-    set(CMAKE_C_FLAGS_PROFILE CACHE STRING "" FORCE)
-
-    set(CMAKE_CXX_FLAGS_PROFILE ${CMAKE_CXX_FLAGS_RELEASE} -ggdb -pg -fno-omit-frame-pointer)
-    list(REMOVE_DUPLICATES CMAKE_CXX_FLAGS_PROFILE)
-    set(CMAKE_CXX_FLAGS_PROFILE CACHE STRING "" FORCE)
-
-    set(CMAKE_EXE_LINKER_FLAGS_PROFILE ${CMAKE_EXE_LINKER_FLAGS_RELEASE} -pg)
-    list(REMOVE_DUPLICATES CMAKE_EXE_LINKER_FLAGS_PROFILE)
-    set(CMAKE_EXE_LINKER_FLAGS_PROFILE CACHE STRING "" FORCE)
-
-    set(CMAKE_SHARED_LINKER_FLAGS_PROFILE ${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -pg)
-    list(REMOVE_DUPLICATES CMAKE_SHARED_LINKER_FLAGS_PROFILE)
-    set(CMAKE_SHARED_LINKER_FLAGS_PROFILE CACHE STRING "" FORCE)
-
-    set(CMAKE_STATIC_LINKER_FLAGS_PROFILE ${CMAKE_STATIC_LINKER_FLAGS_RELEASE} -pg)
-    list(REMOVE_DUPLICATES CMAKE_STATIC_LINKER_FLAGS_PROFILE)
-    set(CMAKE_STATIC_LINKER_FLAGS_PROFILE CACHE STRING "" FORCE)
-
-    set(CMAKE_MODULE_LINKER_FLAGS_PROFILE ${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -pg)
-    list(REMOVE_DUPLICATES CMAKE_MODULE_LINKER_FLAGS_PROFILE)
-    set(CMAKE_MODULE_LINKER_FLAGS_PROFILE CACHE STRING "" FORCE)
+    set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE} ${_gcc_debug_flags} ${_gcc_profile_flags}"
+        CACHE STRING "" FORCE)
+    set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE} ${_gcc_debug_flags} ${_gcc_profile_flags}"
+        CACHE STRING "" FORCE)
+    set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${_gcc_profile_flags}"
+        CACHE STRING "" FORCE)
+    set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${_gcc_profile_flags}"
+        CACHE STRING "" FORCE)
+    set(CMAKE_STATIC_LINKER_FLAGS_PROFILE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} ${_gcc_profile_flags}"
+        CACHE STRING "" FORCE)
+    set(CMAKE_MODULE_LINKER_FLAGS_PROFILE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} ${_gcc_profile_flags}"
+        CACHE STRING "" FORCE)
   elseif(CMAKE_CXX_COMPILER_IS_Intel)
     message("Set options for profiling with Intel C++")
   elseif(CMAKE_CXX_COMPILER_IS_MSVC)
@@ -58,13 +50,11 @@ if(CMAKE_BUILD_TYPE STREQUAL Profile)
 elseif(CMAKE_BUILD_TYPE STREQUAL Debug)
   # В режиме отладки подробный вывод сообщений компилятора
   if(CMAKE_CXX_COMPILER_IS_Clang OR CMAKE_CXX_COMPILER_IS_GCC)
-    set(CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG} -ggdb -fno-omit-frame-pointer)
-    list(REMOVE_DUPLICATES CMAKE_C_FLAGS_DEBUG)
-    set(CMAKE_C_FLAGS_DEBUG CACHE STRING "" FORCE)
+    string(REPLACE " ${_gcc_debug_flags}" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${_gcc_debug_flags}" CACHE STRING "" FORCE)
 
-    set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG} -ggdb -fno-omit-frame-pointer)
-    list(REMOVE_DUPLICATES CMAKE_CXX_FLAGS_DEBUG)
-    set(CMAKE_CXX_FLAGS_DEBUG CACHE STRING "" FORCE)
+    string(REPLACE " ${_gcc_debug_flags}" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${_gcc_debug_flags}" CACHE STRING "" FORCE)
   endif()
   set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "Enable generation of verbose build scripts." FORCE)
   set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL "Enable generation of compile_commands.json." FORCE)
@@ -77,3 +67,6 @@ elseif(CMAKE_BUILD_TYPE STREQUAL None)
   set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL "Enable generation of compile_commands.json." FORCE)
   set(ANALYSIS 1)
 endif()
+
+unset(_gcc_debug_flags)
+unset(_gcc_profile_flags)