diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-02-28 14:39:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-28 14:39:17 -0500 |
| commit | 3817871beb53f671e76428709f3bdbd5ae803701 (patch) | |
| tree | c60c9acd4c04f58d477702dc7fdce37551ae2acc | |
| parent | 6baf17e9d111a444543e79e4293f75a8d5ae24c6 (diff) | |
| parent | 9557d29b7a5f3476ce024ae54410c997b9088f4a (diff) | |
| download | googletest-3817871beb53f671e76428709f3bdbd5ae803701.tar.gz googletest-3817871beb53f671e76428709f3bdbd5ae803701.tar.bz2 googletest-3817871beb53f671e76428709f3bdbd5ae803701.zip | |
Merge branch 'master' into json
| -rw-r--r-- | googletest/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | googletest/cmake/internal_utils.cmake | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt index 575353f4..b09c46ed 100644 --- 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) diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake index 3277cc5c..6448918f 100644 --- 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 |