Fix clobbering of default CMAKE_CXX_FLAGS_RELEASE

BENCHMARK_ENABLE_LTO=true was completely replacing CMAKE_CXX_FLAGS_RELEASE; meaning neither CMake's release defaults nor user customizations were being applied.

Fix clobbering of default CMAKE_CXX_FLAGS_RELEASE
9bb1ba6b · Billy Robert O'Neal III · 60b59217 · 9bb1ba6b
Commit 9bb1ba6b authored Apr 27, 2016 by Billy Robert O'Neal III
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

CMakeLists.txt CMakeLists.txt +4 -4

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,10 +39,10 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")

  # Link time optimisation
  if (BENCHMARK_ENABLE_LTO)
-    set(CMAKE_CXX_FLAGS_RELEASE "/GL")
-    set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "/LTCG")
-    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/LTCG")
-    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL")
+    set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /LTCG")
+    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG")
+    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG")
  endif()
 else()
  # Try and enable C++11. Don't use C++14 because it doesn't work in some