chromaprint: revert to bundled gtest (the patch comments are outdated, as

it is incuded in the distfile rather than requiring separate download).
unbreaks build following gtest update.
master
sthen 2023-08-21 12:56:45 +00:00
parent 32369671bc
commit 2501c5a9a1
3 changed files with 1 additions and 74 deletions

View File

@ -3,6 +3,7 @@ COMMENT = audio fingerprint extraction library
GH_ACCOUNT = acoustid
GH_PROJECT = chromaprint
GH_TAGNAME = v1.5.1
REVISION = 0
SHARED_LIBS = chromaprint 3.0 # 1.5.0
@ -21,9 +22,6 @@ COMPILER = base-clang ports-gcc
MODULES = devel/cmake
BUILD_DEPENDS = audio/taglib
# gtest presence is checked in configure stage, so this cannot be
# in TEST_DEPENDS
BUILD_DEPENDS += devel/gtest
LIB_DEPENDS = graphics/ffmpeg
@ -35,9 +33,6 @@ TEST_TARGET = check
CXXFLAGS += -I${LOCALBASE}/include
MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib
pre-configure:
${SUBST_CMD} ${WRKSRC}/cmake/modules/FindGTest.cmake
do-test:
${WRKBUILD}/tests/all_tests

View File

@ -1,41 +0,0 @@
Find gtest from devel/gtest.
Index: cmake/modules/FindGTest.cmake
--- cmake/modules/FindGTest.cmake.orig
+++ cmake/modules/FindGTest.cmake
@@ -55,14 +55,30 @@ find_path(GTEST_SOURCE_DIR
)
mark_as_advanced(GTEST_SOURCE_DIR)
+find_path(GTEST_INCLUDE_DIR
+ NAMES gtest/gtest.h
+ HINTS $ENV{GTEST_ROOT}/include ${GTEST_ROOT}/include
+)
+mark_as_advanced(GTEST_INCLUDE_DIR)
+
+MACRO(GTEST_FIND varname shortname)
+ FIND_LIBRARY(${varname}
+ NAMES ${shortname}
+ PATHS
+ /usr/local/lib
+ NO_DEFAULT_PATH
+ DOC "Location of GTEST Libraries"
+ )
+ENDMACRO(GTEST_FIND)
+
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(GTest DEFAULT_MSG GTEST_SOURCE_DIR)
+find_package_handle_standard_args(GTest DEFAULT_MSG GTEST_INCLUDE_DIR)
if(GTEST_FOUND)
SET(GTEST_INCLUDE_DIRS
- ${GTEST_SOURCE_DIR}/include
+ ${GTEST_INCLUDE_DIR}
)
- SET(GTEST_SOURCES
- ${GTEST_SOURCE_DIR}/src/gtest-all.cc
- )
+ GTEST_FIND(GTEST_LIBRARIES gtest)
+ GTEST_FIND(GTEST_MAIN_LIBRARIES gtest_main)
+ SET(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
endif()

View File

@ -1,27 +0,0 @@
Using devel/gtest instead of using a third party one that we
would need to download and extract.
Index: tests/CMakeLists.txt
--- tests/CMakeLists.txt.orig
+++ tests/CMakeLists.txt
@@ -1,11 +1,6 @@
find_package(GTest REQUIRED)
find_package(Threads REQUIRED)
-add_library(gtest STATIC ${GTEST_SOURCES})
-target_include_directories(gtest INTERFACE ${GTEST_INCLUDE_DIRS})
-target_include_directories(gtest PRIVATE ${GTEST_INCLUDE_DIRS} ${GTEST_SOURCE_DIR})
-target_link_libraries(gtest Threads::Threads)
-
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
)
@@ -40,6 +35,8 @@ if(BUILD_TOOLS)
set(SRCS ${SRCS} ../src/audio/ffmpeg_audio_reader_test.cpp)
link_libraries(fpcalc_libs)
endif()
+
+link_libraries(gtest)
add_executable(all_tests ${SRCS} $<TARGET_OBJECTS:chromaprint_objs>)
target_link_libraries(all_tests PRIVATE chromaprint gtest)