From 9be973ca1bd2032d11f45beec9f7209ea5ca3ba8 Mon Sep 17 00:00:00 2001 From: RobertGawron Date: Thu, 26 Jun 2025 23:08:45 +0200 Subject: [PATCH] xxx --- Software/Firmware/new_begining/CMakeLists.txt | 24 +++---- .../IonizationChamber.dir/DependInfo.cmake | 2 +- .../IonizationChamber.dir/flags.make | 2 +- .../build/CMakeFiles/Makefile.cmake | 63 ------------------- Software/Firmware/new_begining/build/Makefile | 8 +++ 5 files changed, 23 insertions(+), 76 deletions(-) diff --git a/Software/Firmware/new_begining/CMakeLists.txt b/Software/Firmware/new_begining/CMakeLists.txt index 1b37c7d..bc8aa12 100755 --- a/Software/Firmware/new_begining/CMakeLists.txt +++ b/Software/Firmware/new_begining/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16) +cmake_minimum_required(VERSION 3.31) # Compiler setup set(CMAKE_C_OUTPUT_EXTENSION ".rel") @@ -38,10 +38,12 @@ add_library(STM8StdPeriph STATIC target_compile_options(STM8StdPeriph PRIVATE ${SDCC_FLAGS}) target_compile_definitions(STM8StdPeriph PRIVATE ${SDCC_DEFINITIONS}) -# Library-specific includes -target_include_directories(STM8StdPeriph PRIVATE - ${CMAKE_SOURCE_DIR}/STM8S_StdPeriph_Lib/inc - ${CMAKE_SOURCE_DIR} +# Library-specific includes with proper scoping +target_include_directories(STM8StdPeriph + PUBLIC # Public interface for library users + ${CMAKE_SOURCE_DIR}/STM8S_StdPeriph_Lib/inc + PRIVATE # Internal includes + ${CMAKE_SOURCE_DIR} ) # Main executable @@ -60,12 +62,12 @@ target_compile_options(IonizationChamber PRIVATE ${SDCC_FLAGS}) target_compile_definitions(IonizationChamber PRIVATE ${SDCC_DEFINITIONS}) # Executable-specific includes -target_include_directories(IonizationChamber PRIVATE - ${CMAKE_SOURCE_DIR}/STM8S_StdPeriph_Lib/inc - ${CMAKE_SOURCE_DIR}/Application - ${CMAKE_SOURCE_DIR}/Device - ${CMAKE_SOURCE_DIR}/Driver - ${CMAKE_SOURCE_DIR} +target_include_directories(IonizationChamber + PRIVATE # Application-specific includes + ${CMAKE_SOURCE_DIR}/Application + ${CMAKE_SOURCE_DIR}/Device + ${CMAKE_SOURCE_DIR}/Driver + ${CMAKE_SOURCE_DIR} ) # Link library to executable with proper linker flags diff --git a/Software/Firmware/new_begining/build/CMakeFiles/IonizationChamber.dir/DependInfo.cmake b/Software/Firmware/new_begining/build/CMakeFiles/IonizationChamber.dir/DependInfo.cmake index f441ab2..a7590e1 100644 --- a/Software/Firmware/new_begining/build/CMakeFiles/IonizationChamber.dir/DependInfo.cmake +++ b/Software/Firmware/new_begining/build/CMakeFiles/IonizationChamber.dir/DependInfo.cmake @@ -27,11 +27,11 @@ set(CMAKE_TARGET_DEFINITIONS_C # The include file search paths: set(CMAKE_C_TARGET_INCLUDE_PATH - "/workspace/Software/Firmware/new_begining/STM8S_StdPeriph_Lib/inc" "/workspace/Software/Firmware/new_begining/Application" "/workspace/Software/Firmware/new_begining/Device" "/workspace/Software/Firmware/new_begining/Driver" "/workspace/Software/Firmware/new_begining" + "/workspace/Software/Firmware/new_begining/STM8S_StdPeriph_Lib/inc" ) # The set of dependency files which are needed: diff --git a/Software/Firmware/new_begining/build/CMakeFiles/IonizationChamber.dir/flags.make b/Software/Firmware/new_begining/build/CMakeFiles/IonizationChamber.dir/flags.make index a530c9a..d78e9cc 100644 --- a/Software/Firmware/new_begining/build/CMakeFiles/IonizationChamber.dir/flags.make +++ b/Software/Firmware/new_begining/build/CMakeFiles/IonizationChamber.dir/flags.make @@ -4,7 +4,7 @@ # compile C with /usr/bin/sdcc C_DEFINES = -DSTM8S003 -DUSE_STDPERIPH_DRIVER -D__SDCC__ -C_INCLUDES = -I/workspace/Software/Firmware/new_begining/STM8S_StdPeriph_Lib/inc -I/workspace/Software/Firmware/new_begining/Application -I/workspace/Software/Firmware/new_begining/Device -I/workspace/Software/Firmware/new_begining/Driver -I/workspace/Software/Firmware/new_begining +C_INCLUDES = -I/workspace/Software/Firmware/new_begining/Application -I/workspace/Software/Firmware/new_begining/Device -I/workspace/Software/Firmware/new_begining/Driver -I/workspace/Software/Firmware/new_begining -I/workspace/Software/Firmware/new_begining/STM8S_StdPeriph_Lib/inc C_FLAGS = -mstm8 --std-sdcc11 --opt-code-size --stack-auto diff --git a/Software/Firmware/new_begining/build/CMakeFiles/Makefile.cmake b/Software/Firmware/new_begining/build/CMakeFiles/Makefile.cmake index b951820..d52bdd9 100644 --- a/Software/Firmware/new_begining/build/CMakeFiles/Makefile.cmake +++ b/Software/Firmware/new_begining/build/CMakeFiles/Makefile.cmake @@ -7,75 +7,15 @@ set(CMAKE_DEPENDS_GENERATOR "Unix Makefiles") # The top level Makefile was generated from the following files: set(CMAKE_MAKEFILE_DEPENDS "CMakeCache.txt" - "/usr/share/cmake-3.31/Modules/CMakeCCompiler.cmake.in" - "/usr/share/cmake-3.31/Modules/CMakeCCompilerABI.c" "/usr/share/cmake-3.31/Modules/CMakeCInformation.cmake" "/usr/share/cmake-3.31/Modules/CMakeCommonLanguageInclude.cmake" - "/usr/share/cmake-3.31/Modules/CMakeCompilerIdDetection.cmake" - "/usr/share/cmake-3.31/Modules/CMakeDetermineCCompiler.cmake" - "/usr/share/cmake-3.31/Modules/CMakeDetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/CMakeDetermineCompilerABI.cmake" - "/usr/share/cmake-3.31/Modules/CMakeDetermineCompilerId.cmake" - "/usr/share/cmake-3.31/Modules/CMakeDetermineCompilerSupport.cmake" - "/usr/share/cmake-3.31/Modules/CMakeDetermineSystem.cmake" - "/usr/share/cmake-3.31/Modules/CMakeFindBinUtils.cmake" "/usr/share/cmake-3.31/Modules/CMakeGenericSystem.cmake" "/usr/share/cmake-3.31/Modules/CMakeInitializeConfigs.cmake" "/usr/share/cmake-3.31/Modules/CMakeLanguageInformation.cmake" - "/usr/share/cmake-3.31/Modules/CMakeParseImplicitIncludeInfo.cmake" - "/usr/share/cmake-3.31/Modules/CMakeParseImplicitLinkInfo.cmake" - "/usr/share/cmake-3.31/Modules/CMakeParseLibraryArchitecture.cmake" - "/usr/share/cmake-3.31/Modules/CMakeSystem.cmake.in" "/usr/share/cmake-3.31/Modules/CMakeSystemSpecificInformation.cmake" "/usr/share/cmake-3.31/Modules/CMakeSystemSpecificInitialize.cmake" - "/usr/share/cmake-3.31/Modules/CMakeTestCCompiler.cmake" - "/usr/share/cmake-3.31/Modules/CMakeTestCompilerCommon.cmake" - "/usr/share/cmake-3.31/Modules/CMakeUnixFindMake.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/ADSP-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/ARMCC-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/ARMClang-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/AppleClang-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/Borland-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/Bruce-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/Clang-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/Clang-DetermineCompilerInternal.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/Compaq-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/Cray-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/CrayClang-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/Embarcadero-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/Fujitsu-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/GHS-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/GNU-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/HP-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/IAR-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/IBMClang-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/Intel-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/LCC-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/MSVC-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/NVHPC-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/NVIDIA-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/OrangeC-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/PGI-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/PathScale-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/SCO-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/SDCC-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/SunPro-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/TI-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/TIClang-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/Tasking-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/Watcom-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/XL-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/XLClang-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.31/Modules/Compiler/zOS-C-DetermineCompiler.cmake" "/usr/share/cmake-3.31/Modules/Internal/CMakeCLinkerInformation.cmake" "/usr/share/cmake-3.31/Modules/Internal/CMakeCommonLinkerInformation.cmake" - "/usr/share/cmake-3.31/Modules/Internal/CMakeDetermineLinkerId.cmake" "/usr/share/cmake-3.31/Modules/Platform/Generic-SDCC-C.cmake" "/usr/share/cmake-3.31/Modules/Platform/Generic.cmake" "/workspace/Software/Firmware/new_begining/CMakeLists.txt" @@ -91,9 +31,6 @@ set(CMAKE_MAKEFILE_OUTPUTS # Byproducts of CMake generate step: set(CMAKE_MAKEFILE_PRODUCTS - "CMakeFiles/3.31.6/CMakeSystem.cmake" - "CMakeFiles/3.31.6/CMakeCCompiler.cmake" - "CMakeFiles/3.31.6/CMakeCCompiler.cmake" "CMakeFiles/CMakeDirectoryInformation.cmake" ) diff --git a/Software/Firmware/new_begining/build/Makefile b/Software/Firmware/new_begining/build/Makefile index a9a150c..95341b0 100644 --- a/Software/Firmware/new_begining/build/Makefile +++ b/Software/Firmware/new_begining/build/Makefile @@ -92,6 +92,13 @@ all: cmake_check_build_system $(CMAKE_COMMAND) -E cmake_progress_start /workspace/Software/Firmware/new_begining/build/CMakeFiles 0 .PHONY : all +# The main codegen target +codegen: cmake_check_build_system + $(CMAKE_COMMAND) -E cmake_progress_start /workspace/Software/Firmware/new_begining/build/CMakeFiles /workspace/Software/Firmware/new_begining/build//CMakeFiles/progress.marks + $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 codegen + $(CMAKE_COMMAND) -E cmake_progress_start /workspace/Software/Firmware/new_begining/build/CMakeFiles 0 +.PHONY : codegen + # The main clean target clean: $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 clean @@ -436,6 +443,7 @@ help: @echo "... all (the default if no target is provided)" @echo "... clean" @echo "... depend" + @echo "... codegen" @echo "... edit_cache" @echo "... rebuild_cache" @echo "... IonizationChamber"