Skip to content

Commit 7b83b72

Browse files
committed
Install gtest from distro
Allows us to remove the custom install scripts from CMake.
1 parent a0967b2 commit 7b83b72

File tree

9 files changed

+11
-23
lines changed

9 files changed

+11
-23
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ endif()
4646
# used by e.g., Debian packaging infrastructure
4747
include(GNUInstallDirs)
4848

49-
add_subdirectory(lib)
5049
add_subdirectory(src)
5150

5251
if(BUILD_TESTING)

ci/install-deps.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff 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

cmake/dependencies.cmake

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
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

45
include(${CMAKE_CURRENT_LIST_DIR}/scripts.cmake)
56

@@ -33,6 +34,10 @@ set(CFLAGS ${DEPENDENCIES_CFLAGS})
3334
set(CPPFLAGS ${DEPENDENCIES_CPPFLAGS})
3435
set(LDFLAGS ${DEPENDENCIES_LDFLAGS})
3536

37+
if(BUILD_TESTING)
38+
find_package(GTest REQUIRED)
39+
endif()
40+
3641
if (NOT LIBAPPIMAGE_SHARED_ONLY)
3742
import_pkgconfig_target(TARGET_NAME liblzma PKGCONFIG_TARGET liblzma)
3843

lib/CMakeLists.txt

Lines changed: 0 additions & 13 deletions
This file was deleted.

lib/gtest

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/libappimage/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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++)
3131
endif()

tests/libappimage/desktop_integration/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff 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
)

tests/libappimage/legacy/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set_property(TARGET fixtures PROPERTY INTERFACE_LINK_LIBRARIES xdg-basedir gtest
44

55
if (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)

0 commit comments

Comments
 (0)