Add new support for googletest (#110)

Signed-off-by: Ricardo González Moreno <[email protected]>
eProsima · Jul 12, 2021 · bcd74e0 · bcd74e0
1 parent cff6ea9
commit bcd74e0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 72 deletions.
diff --git a/cmake/common/gtest.cmake b/cmake/common/gtest.cmake
@@ -14,66 +14,6 @@
 
 option(GTEST_INDIVIDUAL "Activate the execution of GTest tests" OFF)
 
-macro(check_gtest)
-    if(NOT GTEST_FOUND)
-        if(WIN32)
-            option(EPROSIMA_GTEST "Activate special set of GTEST_ROOT" OFF)
-            if(EPROSIMA_BUILD)
-                set(EPROSIMA_GTEST ON)
-            endif()
-        endif()
-
-        # Find package GTest
-        if(WIN32 AND EPROSIMA_GTEST)
-            if(NOT GTEST_ROOT)
-                set(GTEST_ROOT_ $ENV{GTEST_ROOT})
-                if(GTEST_ROOT_)
-                    file(TO_CMAKE_PATH "${GTEST_ROOT_}/${MSVC_ARCH}" GTEST_ROOT)
-                endif()
-            else()
-                file(TO_CMAKE_PATH "${GTEST_ROOT}/${MSVC_ARCH}" GTEST_ROOT)
-            endif()
-        endif()
-        find_package(GTest)
-
-        if(GTEST_FOUND)
-            find_package(Threads REQUIRED)
-            set(GTEST_LIBRARIES ${GTEST_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-            set(GTEST_BOTH_LIBRARIES ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-        endif()
-    endif()
-endmacro()
-
-macro(check_gmock)
-    if(NOT GMOCK_FOUND)
-        if(WIN32)
-            option(EPROSIMA_GMOCK "Activate special set of GMOCK_ROOT" OFF)
-            if(EPROSIMA_BUILD)
-                set(EPROSIMA_GMOCK ON)
-            endif()
-        endif()
-
-        # Find package GMock
-        if(WIN32 AND EPROSIMA_GMOCK)
-            if(NOT GMOCK_ROOT)
-                set(GMOCK_ROOT_ $ENV{GMOCK_ROOT})
-                if(GMOCK_ROOT_)
-                    file(TO_CMAKE_PATH "${GMOCK_ROOT_}/${MSVC_ARCH}" GMOCK_ROOT)
-                endif()
-            else()
-                file(TO_CMAKE_PATH "${GMOCK_ROOT}/${MSVC_ARCH}" GMOCK_ROOT)
-            endif()
-        endif()
-        find_package(GMock)
-
-        if(GMOCK_FOUND)
-            find_package(Threads REQUIRED)
-            set(GMOCK_LIBRARIES ${GMOCK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-            set(GMOCK_BOTH_LIBRARIES ${GMOCK_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-        endif()
-    endif()
-endmacro()
-
 macro(add_gtest test)
     # Parse arguments
     set(multiValueArgs SOURCES ENVIRONMENTS DEPENDENCIES)

diff --git a/colcon.pkg b/colcon.pkg
@@ -0,0 +1,5 @@
+{
+    "name": "fastcdr",
+    "type": "cmake",
+    "dependencies" : ["googletest-distribution"]
+}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+find_package(GTest CONFIG REQUIRED)
 include(${PROJECT_SOURCE_DIR}/cmake/common/gtest.cmake)
-check_gtest()
 
-if(GTEST_FOUND)
-    ###############################################################################
-    # Unit tests
-    ###############################################################################
-    set(UNITTESTS_SOURCE SimpleTest.cpp ResizeTest.cpp)
-    add_executable(UnitTests ${UNITTESTS_SOURCE})
-    set_common_compile_options(UnitTests)
-    target_include_directories(UnitTests PRIVATE ${GTEST_INCLUDE_DIRS})
-    target_link_libraries(UnitTests fastcdr ${GTEST_BOTH_LIBRARIES})
-    add_gtest(UnitTests SOURCES ${UNITTESTS_SOURCE})
-endif()
+###############################################################################
+# Unit tests
+###############################################################################
+set(UNITTESTS_SOURCE SimpleTest.cpp ResizeTest.cpp)
+add_executable(UnitTests ${UNITTESTS_SOURCE})
+set_common_compile_options(UnitTests)
+target_link_libraries(UnitTests fastcdr GTest::gtest_main)
+add_gtest(UnitTests SOURCES ${UNITTESTS_SOURCE})