mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-17 15:43:55 +00:00
8d1381e95c- migrated to cmake, EAPI 6->7, and added tests - add USE=scripts to make python targets and other scripts optional - install missing photo files but behind USE=photos due to being large - give incompatibility warning regarding ~/.scid -> ~/.scid4.7 Fetching the binary tarball for additional assets due to upstream's .zip for other files being an unstable "latest" type. Closes: https://bugs.gentoo.org/710464 Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
16 lines
720 B
Diff
16 lines
720 B
Diff
--- a/gtest/CMakeLists.txt
|
|
+++ b/gtest/CMakeLists.txt
|
|
@@ -19,8 +19,3 @@
|
|
# googletest
|
|
-if(NOT IS_DIRECTORY "${CMAKE_BINARY_DIR}/googletest")
|
|
- find_package(Git)
|
|
- execute_process(COMMAND ${GIT_EXECUTABLE} clone https://github.com/google/googletest.git)
|
|
-endif()
|
|
-set(gtest_force_shared_crt ON CACHE BOOL "Always use msvcrt.dll")
|
|
-add_subdirectory(${CMAKE_BINARY_DIR}/googletest ${CMAKE_BINARY_DIR}/googletest/Build EXCLUDE_FROM_ALL)
|
|
+find_package(GTest REQUIRED)
|
|
|
|
@@ -48,2 +43,2 @@
|
|
target_compile_definitions(scid_tests PRIVATE -DSCID_TESTDIR=\"${CMAKE_CURRENT_LIST_DIR}/\")
|
|
-target_link_libraries(scid_tests PRIVATE scid_base gtest_main)
|
|
+target_link_libraries(scid_tests PRIVATE scid_base ${GTEST_BOTH_LIBRARIES})
|