From 79e86298239526ba8d5661fa5dfef709ab1ee759 Mon Sep 17 00:00:00 2001 From: jake-g00dwin Date: Sat, 20 Dec 2025 18:42:49 -0800 Subject: [PATCH] Fixed up root cmake config + Added -Werror flag. + Added correct CppUTest pkg finding. + Added inclusion of new layout. --- CMakeLists.txt | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 534d21c..918163f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.20) # Use the fancy version substitution -project(main +project(WCH_Template VERSION 0.1.0 DESCRIPTION "template for cmake + cpputest" LANGUAGES C CXX @@ -24,7 +24,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # Request C standard features set(CMAKE_C_STANDARD 23) set(CMAKE_C_STANDARD_REQUIRED True) -set(CMAKE_C_FLAGS "-Wall -Wpedantic") +set(CMAKE_C_FLAGS "-Wall -Werror -Wpedantic") # SETUP THE CXX flags for .cpp set(CMAKE_CXX_STANDARD 23) @@ -39,27 +39,30 @@ set(CMAKE_CXX_FLAGS "-Wall -Werror -Wpedantic") if (UNIT_TESTING) - + #Allows usage of preprossor stuff in your files. + add_compile_definitions(UNIT_TESTING=1) if(DEFINED ENV{CPPUTEST_HOME}) message(STATUS "Using CppUTest home: $ENV{CPPUTEST_HOME}") set(CPPUTEST_INCLUDE_DIRS $ENV{CPPUTEST_HOME}/include) - set(CPPUTEST_LIBRARIES $ENV{CPPUTEST_HOME}/lib) - set(CPPUTEST_LDFLAGS CppUTest CppUTestExt) + set(CPPUTEST_LIBRARY_DIRS $ENV{CPPUTEST_HOME}/lib) + #set(CPPUTEST_LIBRARIES $ENV{CPPUTEST_HOME}/lib) + #set(CPPUTEST_LIBRARIES CppUTest CppUTestExt) + #set(CPPUTEST_LDFLAGS CppUTest CppUTestExt) + set(CPPUTEST_LIBRARIES CppUTest CppUTestExt) else() find_package(PkgConfig REQUIRED) pkg_search_module(CPPUTEST REQUIRED cpputest>=3.8) message(STATUS "Found CppUTest version ${CPPUTEST_VERSION}") endif() + + # Diagnostic Messages for Multi-Platform testing. + message(STATUS "CPPUTEST_LIBRARY_DIRS: ${CPPUTEST_LIBRARY_DIRS}") + message(STATUS "CPPUTEST_INCLUDE_DIRS: ${CPPUTEST_INCLUDE_DIRS}" ) + message(STATUS "CPPUTEST_LIBRARIES: ${CPPUTEST_LIBRARIES}" ) + + include_directories(${CPPUTEST_INCLUDE_DIRS}) + link_directories(${CPPUTEST_LIBRARY_DIRS}) - include_directories( - ${CPPUTEST_INCLUDE_DIRS} - #/usr/include/c++/11/ - ./inc - ./mocks - ) - link_directories(${CPPUTEST_LIBRARIES}) - - add_subdirectory(mocks) add_subdirectory(tests) endif()