mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
dev-libs/pthreadpool: drop gtest download
Closes: https://bugs.gentoo.org/843593 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/CMakeLists.txt 2022-05-09 12:38:59.927116924 +0200
|
||||
+++ b/CMakeLists.txt 2022-05-09 12:39:39.141532680 +0200
|
||||
@@ -37,12 +38,6 @@
|
||||
@@ -37,22 +37,10 @@
|
||||
|
||||
# ---[ Download deps
|
||||
IF(NOT DEFINED FXDIV_SOURCE_DIR)
|
||||
@@ -13,6 +13,16 @@
|
||||
SET(FXDIV_SOURCE_DIR "${CMAKE_BINARY_DIR}/FXdiv-source" CACHE STRING "FXdiv source directory")
|
||||
ENDIF()
|
||||
|
||||
IF(PTHREADPOOL_BUILD_TESTS AND NOT DEFINED GOOGLETEST_SOURCE_DIR)
|
||||
- MESSAGE(STATUS "Downloading Google Test to ${CMAKE_BINARY_DIR}/googletest-source (define GOOGLETEST_SOURCE_DIR to avoid it)")
|
||||
- CONFIGURE_FILE(cmake/DownloadGoogleTest.cmake "${CMAKE_BINARY_DIR}/googletest-download/CMakeLists.txt")
|
||||
- EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
|
||||
- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download")
|
||||
- EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" --build .
|
||||
- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download")
|
||||
SET(GOOGLETEST_SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-source" CACHE STRING "Google Test source directory")
|
||||
ENDIF()
|
||||
|
||||
@@ -153,11 +143,7 @@
|
||||
IF(NOT TARGET fxdiv)
|
||||
SET(FXDIV_BUILD_TESTS OFF CACHE BOOL "")
|
||||
@@ -25,3 +35,13 @@
|
||||
|
||||
INSTALL(TARGETS pthreadpool
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
@@ -157,9 +151,6 @@
|
||||
# ---[ Build google test
|
||||
IF(NOT TARGET gtest)
|
||||
SET(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
|
||||
- ADD_SUBDIRECTORY(
|
||||
- "${GOOGLETEST_SOURCE_DIR}"
|
||||
- "${CMAKE_BINARY_DIR}/googletest")
|
||||
ENDIF()
|
||||
|
||||
ADD_EXECUTABLE(pthreadpool-test test/pthreadpool.cc)
|
||||
|
||||
Reference in New Issue
Block a user