Refactor googletest usage

nasa · Nov 20, 2023 · 8245a57 · 8245a57
1 parent 51b2a84
commit 8245a57
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 50 deletions.
diff --git a/Drv/Ip/CMakeLists.txt b/Drv/Ip/CMakeLists.txt
@@ -27,7 +27,7 @@ if (BUILD_TESTING)
 		"${CMAKE_CURRENT_LIST_DIR}/test/ut/SocketTestHelper.cpp")
 	target_include_directories(PortSelector PUBLIC
 			"${FPRIME_FRAMEWORK_PATH}/STest"
-			"${FPRIME_FRAMEWORK_PATH}/gtest/googletest-src/googletest/include"
+			"${FPRIME_FRAMEWORK_PATH}/googletest/googletest/include"
 	)
 	add_dependencies(PortSelector STest Fw_Buffer)
 	target_link_libraries(PortSelector STest Fw_Buffer)

diff --git a/cmake/FPrime.cmake b/cmake/FPrime.cmake
@@ -160,7 +160,7 @@ function(fprime_setup_included_code)
     setup_global_targets()
     # For BUILD_TESTING builds then set up libraries that support testing
     if (BUILD_TESTING AND NOT DEFINED FPRIME_SUB_BUILD_TARGETS)
-        include("${FPRIME_FRAMEWORK_PATH}/cmake/googletest-download/googletest.cmake")
+        add_subdirectory("${FPRIME_FRAMEWORK_PATH}/googletest/" "${CMAKE_BINARY_DIR}/F-Prime/googletest")
     endif()
     if (BUILD_TESTING)
         add_subdirectory("${FPRIME_FRAMEWORK_PATH}/STest/" "${CMAKE_BINARY_DIR}/F-Prime/STest")

diff --git a/cmake/googletest-download/CMakeLists.txt.in b/cmake/googletest-download/CMakeLists.txt.in
diff --git a/cmake/googletest-download/googletest.cmake b/cmake/googletest-download/googletest.cmake