Skip to content

Commit 1ee3446

Browse files
committed
try old version to see if it fails
1 parent dbb2e79 commit 1ee3446

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

config/AddGoogletest.cmake

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,14 @@ endif()
9797
function(add_unit_test test_source_file)
9898
get_filename_component(test_name "${test_source_file}" NAME_WE)
9999
add_executable("${test_name}" "${test_source_file}")
100-
target_link_libraries("${test_name}" GTest::gtest GTest::gmock GTest::gtest_main)
100+
target_link_libraries("${test_name}" gtest gmock gtest_main)
101101
add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
102102
set_target_properties(${test_name} PROPERTIES FOLDER "Tests")
103103
endfunction()
104104

105105
# Target must already exist
106106
macro(add_gtest TESTNAME)
107-
target_link_libraries(
108-
${TESTNAME} PUBLIC GTest::gtest GTest::gmock GTest::gtest_main
109-
)
107+
target_link_libraries(${TESTNAME} PUBLIC gtest gmock gtest_main)
110108

111109
if(GOOGLE_TEST_INDIVIDUAL)
112110
gtest_discover_tests(

test/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ else()
165165
target_compile_options(test_all_unit_base PRIVATE /wd4459)
166166
endif()
167167
target_link_libraries(
168-
test_all_unit_base GTest::gtest GTest::gmock GTest::gtest_main
169-
${UNITS_LC_PROJECT_NAME}::units compile_flags_target
168+
test_all_unit_base gtest gmock gtest_main ${UNITS_LC_PROJECT_NAME}::units
169+
compile_flags_target
170170
)
171171
set_target_properties(test_all_unit_base PROPERTIES FOLDER "Tests")
172172
# test_all_unit_base should not be added to the tests it will take a long time run

0 commit comments

Comments
 (0)