WIP: changed gtest build script

Author: PBetzler

CMakeLists.txt

@@ -8,14 +8,15 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-# External dependencies
-set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/external)
 
+find_package(cifuzz NO_SYSTEM_ENVIRONMENT_PATH)
 enable_testing()
+enable_fuzz_testing()
+# External dependencies
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/external)
 include(googletest)
 
-find_package(cifuzz NO_SYSTEM_ENVIRONMENT_PATH)
-enable_fuzz_testing()
+
 
 add_subdirectory(src/simple_examples)
 add_subdirectory(src/state_example)

cmake/external/googletest.cmake

@@ -9,35 +9,35 @@ set(GTEST_MAIN_LIBRARIES gtest_main)
 set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
 
 foreach(lib IN LISTS GTEST_BOTH_LIBRARIES)
-  if (MSVC)
-    if (CMAKE_BUILD_TYPE MATCHES Debug)
-      set(LIB_PATH ${GTEST_INSTALL_DIR}/lib/${lib}d.lib)
+    if (MSVC)
+        if (CMAKE_BUILD_TYPE MATCHES Debug)
+            set(LIB_PATH ${GTEST_INSTALL_DIR}/lib/${lib}d.lib)
+        else()
+            set(LIB_PATH ${GTEST_INSTALL_DIR}/lib/${lib}.lib)
+        endif()
     else()
-      set(LIB_PATH ${GTEST_INSTALL_DIR}/lib/${lib}.lib)
+        set(LIB_PATH ${GTEST_INSTALL_DIR}/lib/lib${lib}.a)
     endif()
-  else()
-    set(LIB_PATH ${GTEST_INSTALL_DIR}/lib/lib${lib}.a)
-  endif()
-  list(APPEND GTEST_BUILD_BYPRODUCTS ${LIB_PATH})
+    list(APPEND GTEST_BUILD_BYPRODUCTS ${LIB_PATH})
 
-  add_library(${lib} STATIC IMPORTED)
-  set_property(TARGET ${lib} PROPERTY IMPORTED_LOCATION
-               ${LIB_PATH})
-  add_dependencies(${lib} ${GTEST_TARGET})
+    add_library(${lib} STATIC IMPORTED)
+    set_property(TARGET ${lib} PROPERTY IMPORTED_LOCATION
+            ${LIB_PATH})
+    add_dependencies(${lib} ${GTEST_TARGET})
 endforeach(lib)
 
 include (ExternalProject)
 ExternalProject_Add(${GTEST_TARGET}
-    PREFIX ${GTEST_TARGET}
-    GIT_REPOSITORY https://github.com/google/googletest.git
-    GIT_TAG v1.14.0
-    UPDATE_COMMAND ""
-    CMAKE_CACHE_ARGS -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
-                     -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
-                     -DCMAKE_C_COMPILER_LAUNCHER:FILEPATH=${CMAKE_C_COMPILER_LAUNCHER}
-                     -DCMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=${CMAKE_CXX_COMPILER_LAUNCHER}
-    CMAKE_ARGS ${CMAKE_ARGS}
-               -DCMAKE_INSTALL_PREFIX=${GTEST_INSTALL_DIR}
-               -DCMAKE_INSTALL_LIBDIR=lib
-    BUILD_BYPRODUCTS ${GTEST_BUILD_BYPRODUCTS}
+        PREFIX ${GTEST_TARGET}
+        GIT_REPOSITORY https://github.com/google/googletest.git
+        GIT_TAG v1.14.0
+        UPDATE_COMMAND ""
+        CMAKE_CACHE_ARGS -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
+        -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
+        -DCMAKE_C_COMPILER_LAUNCHER:FILEPATH=${CMAKE_C_COMPILER_LAUNCHER}
+        -DCMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=${CMAKE_CXX_COMPILER_LAUNCHER}
+        CMAKE_ARGS ${CMAKE_ARGS}
+        -DCMAKE_INSTALL_PREFIX=${GTEST_INSTALL_DIR}
+        -DCMAKE_INSTALL_LIBDIR=lib
+        BUILD_BYPRODUCTS ${GTEST_BUILD_BYPRODUCTS}
 )

src/simple_examples/CMakeLists.txt

@@ -42,6 +42,8 @@ foreach(TestType IN ITEMS
         ${TestType}_test.cpp
         TEST_FRAMEWORK 
         GTEST
+        TEST_FRAMEWORK_LIBS
+        ${GTEST_BOTH_LIBRARIES}
     )
 
     target_link_libraries(${TestType}_fuzz_test