Skip to content

Commit

Permalink
Merge Develop into Freeze
Browse files Browse the repository at this point in the history
  • Loading branch information
azoitl authored Oct 3, 2024
2 parents 4087e4e + 65a5cad commit 2e6fec4
Show file tree
Hide file tree
Showing 154 changed files with 12,738 additions and 3,254 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/cmake-multi-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ jobs:
-DFORTE_MODULE_RT_Events=ON
-DFORTE_MODULE_SIGNALPROCESSING=ON
-DFORTE_MODULE_UTILS=ON
-DFORTE_BUILD_STATIC_LIBRARY=ON
-DFORTE_BUILD_SHARED_LIBRARY=ON
-DFORTE_C_INTERFACE=ON
-DFORTE_TESTS=ON
-DFORTE_TEST_SANITIZE=ON
${{ matrix.os == 'windows-latest' && format('-DFORTE_TESTS_INC_DIRS={0}/boost.1.84.0/lib/native/include', github.workspace) || '' }}
Expand Down
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Copyright (c) 2010 - 2015 Profactor GmbH, AIT, fortiss GmbH
# 2010-2015, 2020 TU Wien/ACIN
# 2022 Martin Erich Jobst
# 2024 Jose Cabral
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
Expand Down Expand Up @@ -62,6 +63,9 @@ mark_as_advanced(FORTE_BUILD_STATIC_LIBRARY)
set(FORTE_BUILD_SHARED_LIBRARY OFF CACHE BOOL "Build FORTE as shared library")
mark_as_advanced(FORTE_BUILD_SHARED_LIBRARY)

SET(FORTE_C_INTERFACE OFF CACHE BOOL "Build C interface to Forte")
mark_as_advanced(FORTE_C_INTERFACE)

#######################################################################################
# Determine the loglevel
#######################################################################################
Expand Down
4 changes: 2 additions & 2 deletions buildsupport/toolchains/toolchain-esp32-DualOut.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ SET(FORTE_ARCHITECTURE "FreeRTOSLwIP")



set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions ")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions ")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions")



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ SET(FORTE_ARCHITECTURE "FreeRTOSLwIP")



set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions -Wno-deprecated-declarations")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions -Wno-deprecated-declarations")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions")



Expand Down
4 changes: 2 additions & 2 deletions buildsupport/toolchains/toolchain-esp32-basic.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ SET(FORTE_ARCHITECTURE "FreeRTOSLwIP")



set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions ")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions ")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions")



Expand Down
4 changes: 2 additions & 2 deletions buildsupport/toolchains/toolchain-esp32-datapanel.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ SET(FORTE_ARCHITECTURE "FreeRTOSLwIP")



set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions -Wno-deprecated-declarations")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions -Wno-deprecated-declarations")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions")



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ SET(FORTE_ARCHITECTURE "FreeRTOSLwIP")



set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions -Wno-deprecated-declarations")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions -Wno-deprecated-declarations")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions")



Expand Down
Loading

0 comments on commit 2e6fec4

Please sign in to comment.