File tree Expand file tree Collapse file tree 9 files changed +11
-23
lines changed Expand file tree Collapse file tree 9 files changed +11
-23
lines changed Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -46,7 +46,6 @@ endif()
4646# used by e.g., Debian packaging infrastructure
4747include (GNUInstallDirs)
4848
49- add_subdirectory (lib)
5049add_subdirectory (src)
5150
5251if (BUILD_TESTING)
Original file line number Diff line number Diff line change @@ -34,6 +34,7 @@ packages=(
3434 lcov
3535 gcovr
3636 libboost-dev
37+ libgtest-dev
3738)
3839
3940# make sure installation won't hang on GitHub actions
Original file line number Diff line number Diff line change 11# >= 3.2 required for ExternalProject_Add_StepDependencies
2- cmake_minimum_required (VERSION 3.2)
2+ # >= 3.20 for FindGTest IMPORTED target
3+ cmake_minimum_required (VERSION 3.20)
34
45include (${CMAKE_CURRENT_LIST_DIR} /scripts.cmake)
56
@@ -33,6 +34,10 @@ set(CFLAGS ${DEPENDENCIES_CFLAGS})
3334set (CPPFLAGS ${DEPENDENCIES_CPPFLAGS} )
3435set (LDFLAGS ${DEPENDENCIES_LDFLAGS} )
3536
37+ if (BUILD_TESTING)
38+ find_package (GTest REQUIRED)
39+ endif ()
40+
3641if (NOT LIBAPPIMAGE_SHARED_ONLY)
3742 import_pkgconfig_target(TARGET_NAME liblzma PKGCONFIG_TARGET liblzma)
3843
Load Diff This file was deleted.
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ if (NOT LIBAPPIMAGE_SHARED_ONLY)
2525 )
2626
2727 target_include_directories (test_libappimage++ PRIVATE "${PROJECT_SOURCE_DIR} /src/libappimage" )
28- target_link_libraries (test_libappimage++ temporarydirectory libappimage libarchive libsquashfuse XdgUtils::DesktopEntry XdgUtils::BaseDir gtest gtest_main)
28+ target_link_libraries (test_libappimage++ temporarydirectory libappimage libarchive libsquashfuse XdgUtils::DesktopEntry XdgUtils::BaseDir GTest:: gtest GTest:: gtest_main)
2929
3030 add_test (test_libappimage++ test_libappimage++)
3131endif ()
Original file line number Diff line number Diff line change @@ -36,8 +36,8 @@ target_link_libraries(TestDesktopIntegration
3636 # statically once glib is loaded.
3737 PRIVATE libglib
3838 PUBLIC dl
39- PRIVATE gtest
40- PRIVATE gtest_main
39+ PRIVATE GTest:: gtest
40+ PRIVATE GTest:: gtest_main
4141 PRIVATE librsvg
4242 PRIVATE libcairo
4343)
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ set_property(TARGET fixtures PROPERTY INTERFACE_LINK_LIBRARIES xdg-basedir gtest
44
55if (NOT LIBAPPIMAGE_SHARED_ONLY)
66 add_executable (test_libappimage test_libappimage.cpp)
7- target_link_libraries (test_libappimage fixtures libappimage libsquashfuse libglib libgobject gtest gtest_main)
7+ target_link_libraries (test_libappimage fixtures libappimage libsquashfuse libglib libgobject GTest:: gtest GTest:: gtest_main)
88
99 add_executable (test -xdg-basedir test -xdg-basedir.cpp)
1010 target_link_libraries (test -xdg-basedir fixtures xdg-basedir)
You can’t perform that action at this time.
0 commit comments