diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-12-22 14:47:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-22 14:47:25 -0500 |
| commit | e76c3f837c83d82a54c7b569ad61efcfca811131 (patch) | |
| tree | 200263c4d31fc693e94abd44689911f599100e92 | |
| parent | b5b6a07d1422603ddb357166950d33fd9fb25f86 (diff) | |
| parent | 5490beb0602eab560fa3969a4410e11d94bf12af (diff) | |
| download | googletest-e76c3f837c83d82a54c7b569ad61efcfca811131.tar.gz googletest-e76c3f837c83d82a54c7b569ad61efcfca811131.tar.bz2 googletest-e76c3f837c83d82a54c7b569ad61efcfca811131.zip | |
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
| -rw-r--r-- | googlemock/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | googletest/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | googletest/include/gtest/gtest.h | 2 |
3 files changed, 13 insertions, 15 deletions
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt index ead51bf3..21d61b13 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt @@ -112,11 +112,11 @@ endif() # Install rules if(INSTALL_GMOCK) install(TARGETS gmock gmock_main - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(DIRECTORY ${gmock_SOURCE_DIR}/include/gmock - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") + install(DIRECTORY "${gmock_SOURCE_DIR}/include/gmock" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") # configure and install pkgconfig files configure_file( diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt index 3b907fd7..77b55cae 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt @@ -74,8 +74,8 @@ config_compiler_and_linker() # Defined in internal_utils.cmake. # Where Google Test's .h files can be found. include_directories( - ${gtest_SOURCE_DIR}/include - ${gtest_SOURCE_DIR}) + "${gtest_SOURCE_DIR}/include" + "${gtest_SOURCE_DIR}") # Summary of tuple support for Microsoft Visual Studio: # Compiler version(MS) version(cmake) Support @@ -88,7 +88,7 @@ include_directories( if (MSVC AND MSVC_VERSION EQUAL 1700) add_definitions(/D _VARIADIC_MAX=10) endif() - + ######################################################################## # # Defines the gtest & gtest_main libraries. User tests should link @@ -114,11 +114,11 @@ endif() # Install rules if(INSTALL_GTEST) install(TARGETS gtest gtest_main - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") + install(DIRECTORY "${gtest_SOURCE_DIR}/include/gtest" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") # configure and install pkgconfig files configure_file( diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index 1b55677a..a19625f3 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -1386,11 +1386,9 @@ AssertionResult CmpHelperEQ(const char* lhs_expression, const char* rhs_expression, const T1& lhs, const T2& rhs) { -GTEST_DISABLE_MSC_WARNINGS_PUSH_(4389 /* signed/unsigned mismatch */) if (lhs == rhs) { return AssertionSuccess(); } -GTEST_DISABLE_MSC_WARNINGS_POP_() return CmpHelperEQFailure(lhs_expression, rhs_expression, lhs, rhs); } |