diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2022-05-10 18:12:54 +0200 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2022-05-10 18:12:54 +0200 |
| commit | 21dcf273f2cc3859844a71e52cc5fecd63cfa9e5 (patch) | |
| tree | e4b79e50b29f78bd3d7ce64250282c152d36c6b1 /dev-libs/pthreadpool | |
| parent | dev-java/jakarta-xml-soap-api: virtual/jdk-1.8:*" -> -11:* (diff) | |
| download | gentoo-21dcf273f2cc3859844a71e52cc5fecd63cfa9e5.tar.gz gentoo-21dcf273f2cc3859844a71e52cc5fecd63cfa9e5.tar.bz2 gentoo-21dcf273f2cc3859844a71e52cc5fecd63cfa9e5.zip | |
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>
Diffstat (limited to 'dev-libs/pthreadpool')
| -rw-r--r-- | dev-libs/pthreadpool/files/pthreadpool-2022.05.09-gentoo.patch | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/dev-libs/pthreadpool/files/pthreadpool-2022.05.09-gentoo.patch b/dev-libs/pthreadpool/files/pthreadpool-2022.05.09-gentoo.patch index 3c2edfa1ca8a..a818eaabc1a1 100644 --- a/dev-libs/pthreadpool/files/pthreadpool-2022.05.09-gentoo.patch +++ b/dev-libs/pthreadpool/files/pthreadpool-2022.05.09-gentoo.patch @@ -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) |