[celix] branch feature/gtest_main created (now def8a86)

[ab...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

abroekhuis pushed a change to branch feature/gtest_main
in repository https://gitbox.apache.org/repos/asf/celix.git.


      at def8a86  Updated AddGTest to use same names as used in FindGTest

This branch includes the following new commits:

     new def8a86  Updated AddGTest to use same names as used in FindGTest

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[celix] 01/01: Updated AddGTest to use same names as used in FindGTest

[ab...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

abroekhuis pushed a commit to branch feature/gtest_main
in repository https://gitbox.apache.org/repos/asf/celix.git

commit def8a86cdaec8125dfc9270279b218138677796c
Author: Alexander Broekhuis <al...@luminis.eu>
AuthorDate: Wed Apr 1 08:53:37 2020 +0200

    Updated AddGTest to use same names as used in FindGTest
---
 cmake/AddGTest.cmake          | 6 +++---
 libs/dfi/gtest/CMakeLists.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake/AddGTest.cmake b/cmake/AddGTest.cmake
index 1dc78f6..f5dc360 100644
--- a/cmake/AddGTest.cmake
+++ b/cmake/AddGTest.cmake
@@ -34,9 +34,9 @@ set_target_properties(GTest::GTest PROPERTIES
         IMPORTED_LOCATION "${binary_dir}/googlemock/gtest/libgtest.a"
         INTERFACE_INCLUDE_DIRECTORIES "${source_dir}/googletest/include"
         )
-add_library(GTest::GMain IMPORTED STATIC GLOBAL)
-add_dependencies(GTest::GMain googletest_project)
-set_target_properties(GTest::GMain PROPERTIES
+add_library(GTest::Main IMPORTED STATIC GLOBAL)
+add_dependencies(GTest::Main googletest_project)
+set_target_properties(GTest::Main PROPERTIES
         IMPORTED_LOCATION "${binary_dir}/googlemock/gtest/libgtest_main.a"
         INTERFACE_INCLUDE_DIRECTORIES "${source_dir}/googletest/include"
         )
diff --git a/libs/dfi/gtest/CMakeLists.txt b/libs/dfi/gtest/CMakeLists.txt
index 277934e..22ef7e8 100644
--- a/libs/dfi/gtest/CMakeLists.txt
+++ b/libs/dfi/gtest/CMakeLists.txt
@@ -32,7 +32,7 @@ add_executable(test_dfi
 		src/avrobin_serialization_tests.cpp
 )
 
-target_link_libraries(test_dfi PRIVATE Celix::dfi Celix::utils FFI::lib Jansson GTest::GTest GTest::GMain)
+target_link_libraries(test_dfi PRIVATE Celix::dfi Celix::utils FFI::lib Jansson GTest::GTest GTest::Main)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/schemas DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/descriptors DESTINATION ${CMAKE_CURRENT_BINARY_DIR})