MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-01-13 16:03:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to latest googletest/googlemock release

Browse Source 
The old release on googlecode.com now 404s, so out-of-the-box builds were
broken. The releases on github have a slightly different file structure, so it's
more than just a change of URL. I upgraded from 1.7.0 to 1.8.0 in the process.
This commit is contained in:
Scott Lamb 2016-11-12 11:40:18 -08:00
parent 6b6137f8e7
commit 60f0ffc970
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -114,22 +114,22 @@ enable_testing()
# http://www.kaizou.org/2014/11/gtest-cmake/ # http://www.kaizou.org/2014/11/gtest-cmake/
include(ExternalProject) include(ExternalProject)
ExternalProject_Add( ExternalProject_Add(
GMockProject GTestProject
URL "https://googlemock.googlecode.com/files/gmock-1.7.0.zip" URL "https://github.com/google/googletest/archive/release-1.8.0.tar.gz"
URL_HASH "SHA1=f9d9dd882a25f4069ed9ee48e70aff1b53e3c5a5" URL_HASH "SHA1=e7e646a6204638fe8e87e165292b8dd9cd4c36ed"
INSTALL_COMMAND "") INSTALL_COMMAND "")
ExternalProject_Get_Property(GMockProject source_dir binary_dir) ExternalProject_Get_Property(GTestProject source_dir binary_dir)
set(GTest_INCLUDE_DIR ${source_dir}/gtest/include) set(GTest_INCLUDE_DIR ${source_dir}/googletest/include)
add_library(GTest STATIC IMPORTED) add_library(GTest STATIC IMPORTED)
add_dependencies(GTest GMockProject) add_dependencies(GTest GTestProject)
set_target_properties(GTest PROPERTIES set_target_properties(GTest PROPERTIES
IMPORTED_LOCATION "${binary_dir}/gtest/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}" IMPORTED_LOCATION "${binary_dir}/googlemock/gtest/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}"
IMPORTED_LINK_INTERFACE_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}") IMPORTED_LINK_INTERFACE_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
set(GMock_INCLUDE_DIR ${source_dir}/include) set(GMock_INCLUDE_DIR ${source_dir}/googlemock/include)
add_library(GMock STATIC IMPORTED) add_library(GMock STATIC IMPORTED)
add_dependencies(GMock GMockProject) add_dependencies(GMock GTestProject)
set_target_properties(GMock PROPERTIES set_target_properties(GMock PROPERTIES
IMPORTED_LOCATION "${binary_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}" IMPORTED_LOCATION "${binary_dir}/googlemock/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}"
IMPORTED_LINK_INTERFACE_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}") IMPORTED_LINK_INTERFACE_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
ExternalProject_Add( ExternalProject_Add(