Merge branch 'master' into json

3817871b · Gennadiy Civil · GitHub · 6baf17e9 · 9557d29b · 3817871b
Unverified Commit 3817871b authored Feb 28, 2018 by Gennadiy Civil Committed by GitHub Feb 28, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

googletest/CMakeLists.txt googletest/CMakeLists.txt +0 -2

googletest/cmake/internal_utils.cmake googletest/cmake/internal_utils.cmake +4 -0

No files found.
--- a/googletest/CMakeLists.txt
+++ b/googletest/CMakeLists.txt
@@ -27,8 +27,6 @@ option(
  "Build gtest with internal symbols hidden in shared libraries."
  OFF)

-set(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "Generate debug library name with a postfix.")
-
 # Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build().
 include(cmake/hermetic_build.cmake OPTIONAL)


--- a/googletest/cmake/internal_utils.cmake
+++ b/googletest/cmake/internal_utils.cmake
@@ -158,6 +158,10 @@ function(cxx_library_with_type name type cxx_flags)
  set_target_properties(${name}
    PROPERTIES
    COMPILE_FLAGS "${cxx_flags}")
+  # Generate debug library name with a postfix.
+  set_target_properties(${name}
+    PROPERTIES
+    DEBUG_POSTFIX "d")
  if (BUILD_SHARED_LIBS OR type STREQUAL "SHARED")
    set_target_properties(${name}
      PROPERTIES