Merge branch 'main' of https://github.com/Martian-Technologies/Logic-Graph-Creator

Author: ItchyTrack

CMakeLists.txt

@@ -18,7 +18,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
 
 # ======================================== PROJECT SETUP ========================================
 set(BUILD_SHARED_LIBS OFF) # Don't build shared libs
-project(Connection_Machine VERSION 0.9.0)
+project(Connection_Machine VERSION 0.8.0)
 if (APPLE)
 	set(APP_NAME "Connection Machine") # name of the bundle
 else()
@@ -41,28 +41,13 @@ option(CONNECTION_MACHINE_BUILD_TESTS "Build Connection Machine Tests" OFF)
 option(CONNECTION_MACHINE_CODE_COVERAGE "Enable code coverage reporting" OFF)
 option(RUN_TRACY_PROFILER "Enable runtime profiler" OFF)
 
+# ====================================== SILENCE WARNINGS =======================================
+
 if(MSVC)
 	# C4244: 'conversion' conversion from 'type1' to 'type2', possible loss of data
 	# C4267: 'var' conversion from 'size_t' to 'type', possible loss of data
-	add_compile_options(/wd4244 /wd4267)
-endif()
-
-# ======================================= COVERAGE SETUP ========================================
-
-if(CONNECTION_MACHINE_CODE_COVERAGE)
-	if (CONNECTION_MACHINE_BUILD_TESTS)
-		if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-			message(STATUS "Code coverage enabled")
-			add_compile_options(--coverage -O0 -g)
-			add_link_options(--coverage)
-		elseif(MSVC)
-			message(WARNING "Code coverage not supported with MSVC. Use Clang-cl or OpenCppCoverage.")
-		else()
-			message(WARNING "Code coverage not working with: \"${CMAKE_CXX_COMPILER_ID}\"")
-		endif()
-	else()
-		message(WARNING "Code coverage cant not be used without also enabling tests.")
-	endif()
+	# C4018: 'var' signed/unsigned mismatch
+	add_compile_options(/wd4244 /wd4267 /wd4018)
 endif()
 
 set(EXTERNAL_LINKS)

cmake/makeTests.cmake

@@ -7,6 +7,7 @@ CPMAddPackage(
 	GITHUB_REPOSITORY google/googletest
 	GIT_TAG v1.17.0
 	SOURCE_DIR "${EXTERNAL_DIR}/gtest"
+	OPTIONS "gtest_force_shared_crt ON"
 )
 
 set(TEST_DIR "${CMAKE_SOURCE_DIR}/tests")
@@ -32,29 +33,20 @@ add_executable(${PROJECT_NAME}_tests ${TEST_FILES})
 target_include_directories(${PROJECT_NAME}_tests PRIVATE ${SOURCE_DIR} ${TEST_DIR} "${EXTERNAL_DIR}/wasmtime")
 target_link_libraries(${PROJECT_NAME}_tests PRIVATE ${EXTERNAL_LINKS})
 
-if(CODE_COVERAGE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-	target_compile_options(${PROJECT_NAME}_tests PRIVATE --coverage -O0 -g)
-	target_link_options(${PROJECT_NAME}_tests PRIVATE --coverage)
-endif()
-
 target_precompile_headers(${PROJECT_NAME}_tests PRIVATE "${SOURCE_DIR}/precompiled.h")
 
-if(CODE_COVERAGE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-	find_program(GCOVR_PATH gcovr)
-	if(NOT GCOVR_PATH)
-		message(FATAL_ERROR "gcovr not found! Please install it via pip: pip install gcovr")
+if(CONNECTION_MACHINE_CODE_COVERAGE)
+	if (CONNECTION_MACHINE_BUILD_TESTS)
+		if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+			message(STATUS "Code coverage enabled")
+			add_compile_options(--coverage -O0 -g)
+			add_link_options(--coverage)
+		elseif(MSVC)
+			message(WARNING "Code coverage does nothing with MSVC. Use normal Tests build, and use opencpp_coverage.cmd")
+		else()
+			message(WARNING "Code coverage not working with: \"${CMAKE_CXX_COMPILER_ID}\"")
+		endif()
+	else()
+		message(WARNING "Code coverage cant not be used without also enabling tests.")
 	endif()
-
-	add_custom_target(coverage
-		COMMAND ${GCOVR_PATH}
-			--root ${CMAKE_SOURCE_DIR}
-			--filter ${SOURCE_DIR}
-			--exclude-unreachable-branches
-			--print-summary
-			--html --html-details -o coverage.html
-			--gcov-executable gcov
-			--exclude '${EXTERNAL_DIR}'
-		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-		COMMENT "Generating code coverage report with gcovr"
-	)
-endif()
+endif()

opencpp_coverage.cmd

@@ -1,9 +1,11 @@
-set PROJ_SRC=%CD%\src
+set PROJ=%CD%
+set TESTEXE=%PROJ%\build-tests\Debug\Connection_Machine_tests.exe
+
 mkdir coverage
+
 OpenCppCoverage ^
-  --sources "%PROJ_SRC%\*" ^
+  --sources %PROJ%\src ^
   --cover_children ^
   --export_type cobertura:coverage\coverage.xml ^
   --export_type html:coverage ^
-  -- build-tests\Debug\Connection_Machine_tests.exe ^
-  --gtest_output=xml:coverage\gtest.xml
+  -- "%TESTEXE%" --gtest_output=xml:coverage\gtest.xml