unbundle gmock/gtest --- a/buildscripts/cmake/DeclareModuleSetup.cmake +++ b/buildscripts/cmake/DeclareModuleSetup.cmake @@ -182,13 +182,11 @@ macro(setup_module) ${MUSE_FRAMEWORK_PATH} ${MUSE_FRAMEWORK_PATH}/framework ${MUSE_FRAMEWORK_PATH}/framework/global - ${MUSE_FRAMEWORK_PATH}/framework/testing/thirdparty/googletest/googletest/include # compat ${MUSE_FRAMEWORK_PATH}/src ${MUSE_FRAMEWORK_PATH}/src/framework ${MUSE_FRAMEWORK_PATH}/src/framework/global - ${MUSE_FRAMEWORK_PATH}/src/framework/testing/thirdparty/googletest/googletest/include # end compat ${MODULE_INCLUDE_PRIVATE} --- a/src/framework/CMakeLists.txt +++ b/src/framework/CMakeLists.txt @@ -124,7 +124,6 @@ if (MUSE_ENABLE_UNIT_TESTS) ) set(INSTALL_GTEST OFF) - add_subdirectory(testing/thirdparty/googletest) endif() # Stubs --- a/src/framework/testing/gtest.cmake +++ b/src/framework/testing/gtest.cmake @@ -31,9 +31,6 @@ message(STATUS "Configuring ${MODULE_TEST}") -get_property(gmock_LIBS GLOBAL PROPERTY gmock_LIBS) -get_property(gmock_INCLUDE_DIRS GLOBAL PROPERTY gmock_INCLUDE_DIRS) - add_executable(${MODULE_TEST} ${CMAKE_CURRENT_LIST_DIR}/gmain.cpp ${CMAKE_CURRENT_LIST_DIR}/environment.cpp @@ -50,13 +47,11 @@ target_include_directories(${MODULE_TEST} PRIVATE ${MUSE_FRAMEWORK_PATH} ${MUSE_FRAMEWORK_PATH}/framework ${MUSE_FRAMEWORK_PATH}/framework/global - ${MUSE_FRAMEWORK_PATH}/framework/testing/thirdparty/googletest/googletest/include # compat ${MUSE_FRAMEWORK_PATH}/src ${MUSE_FRAMEWORK_PATH}/src/framework ${MUSE_FRAMEWORK_PATH}/src/framework/global - ${MUSE_FRAMEWORK_PATH}/src/framework/testing/thirdparty/googletest/googletest/include # end compat ${MODULE_TEST_INCLUDE} @@ -74,11 +69,16 @@ endif() find_package(Qt6Core REQUIRED) find_package(Qt6Gui REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_check_modules(gtest REQUIRED IMPORTED_TARGET gtest) +pkg_check_modules(gmock REQUIRED IMPORTED_TARGET gmock) +list(APPEND MODULE_TEST_INCLUDE ${gtest_INCLUDE_DIRS} ${gmock_INCLUDE_DIRS}) target_link_libraries(${MODULE_TEST} Qt6::Core Qt6::Gui - gmock + PkgConfig::gmock + PkgConfig::gtest muse_global ${MODULE_TEST_LINK} ${COVERAGE_FLAGS}