adding googletest as subdirectory

removing auto generated files

removing static analysis

removing vestigal library

Author: snhobbs

.gitignore

@@ -2,3 +2,17 @@
 cmake_install.cmake
 Makefile
 build
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+CMakeUserPresets.json
+lib
+tests/modbus_basic_tests

.gitmodules

@@ -1,15 +1,12 @@
-[submodule "examples/libmodbus_tests/-f"]
-	path = examples/libmodbus_tests/-f
-	url = git@github.com:stephane/libmodbus.git
 [submodule "examples/libmodbus_tests/libmodbus"]
 	path = examples/libmodbus_tests/libmodbus
 	url = git@github.com:stephane/libmodbus.git
 [submodule "examples/pymodbus_tests/pymodbus"]
 	path = examples/pymodbus_tests/pymodbus
 	url = git@github.com:riptideio/pymodbus.git
-[submodule "tests/cmake/CMakeStaticAnalysis"]
-	path = tests/CMakeStaticAnalysis
-	url = git@github.com:snhobbs/CMakeStaticAnalysis.git
 [submodule "lib/CppUtilities"]
-	path = lib/CppUtilities
+	path = external/CppUtilities
 	url = git@github.com:snhobbs/CppUtilities
+[submodule "external/googletest"]
+	path = external/googletest
+	url = https://github.com/google/googletest

CMakeLists.txt

@@ -1,5 +1,22 @@
 cmake_minimum_required(VERSION 3.15.0)
 
 project(ModbusBasic)
+
+# Enable testing
 enable_testing()
-ADD_SUBDIRECTORY(tests)
+
+# Set up GoogleTest as a subdirectory. It assumes you have googletest located in external/googletest.
+# This will build GoogleTest inside the build directory as well.
+add_subdirectory(external/googletest)
+
+# Add the tests subdirectory.
+# This assumes that you have a 'tests' directory in your project, where your test code resides.
+add_subdirectory(tests)
+
+# Optional: Set CMake build type (Release, Debug, etc.)
+set(CMAKE_BUILD_TYPE Release)  # You can also set it to Debug, RelWithDebInfo, etc.
+
+# Optional: Define output directories for binaries and libraries (useful for keeping everything in the build folder)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)

ModbusBasicConfig.cmake

@@ -1,18 +1,16 @@
 cmake_minimum_required(VERSION 3.10.0)
 
+set(TargetName "modbus_basic_tests")
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-project(Testing)
+project(${TargetName})
 set(ProjectDirectory "${CMAKE_CURRENT_SOURCE_DIR}/..")
 set(LibraryDirectory ${ProjectDirectory}/external)
-#SET(CMAKE_CXX_COMPILER clang++-9)
-SET(CMAKE_CXX_COMPILER /usr/bin/g++-9)
 else()
 set(ProjectDirectory "${CMAKE_SOURCE_DIR}")
 endif()
 
 message("\n\nProject directory ${ProjectDirectory}\n\n")
 
-set(TargetName "testing")
 add_executable(${TargetName})
 set(ProjectSource ${ProjectDirectory}/src)
 set(BoardDirectory ${ProjectDirectory}/board)
@@ -23,10 +21,7 @@ message("proj source ${ProjectSource}")
 target_include_directories(${TargetName} PUBLIC "${SourceDirectory}")
 
 message("\n\nTest include directory ${LibraryDirectory}\n\n")
-set(gtest_DIR "${CMAKE_CURRENT_SOURCE_DIR}/googletest/googletest")
-set(gmock_DIR "${CMAKE_CURRENT_SOURCE_DIR}/googletest/googlemock")
-target_include_directories(${TargetName} PUBLIC "${gtest_DIR}/include")
-target_include_directories(${TargetName} PUBLIC "${ProjectDirectory}/lib/CppUtilities/include")
+target_include_directories(${TargetName} PUBLIC "${ProjectDirectory}/external/CppUtilities/include")
 target_include_directories(${TargetName} PUBLIC "${ProjectDirectory}/include")