M .gitmodules => .gitmodules +1 -1
@@ 50,7 50,7 @@
path = third-party/magic_enum
url = https://github.com/Neargye/magic_enum.git
[submodule "module-utils/tinyexpr"]
- path = module-utils/tinyexpr
+ path = third-party/tinyexpr/src
url = https://github.com/codeplea/tinyexpr.git
[submodule "module-bsp/board/rt1051/bsp/usb"]
path = module-bsp/board/rt1051/bsp/usb
M cmake/modules/PureCoverage.cmake => cmake/modules/PureCoverage.cmake +0 -1
@@ 35,7 35,6 @@ if(COVERAGE_ENABLE)
module-utils/re2/.*
module-utils/segger/.*
module-utils/taglib/.*
- module-utils/tinyexpr/.*
source/main.cpp
test/.*
third-party/.*
M module-apps/application-calculator/CMakeLists.txt => module-apps/application-calculator/CMakeLists.txt +3 -1
@@ 18,4 18,6 @@ endif()
target_link_libraries(${PROJECT_NAME}
PRIVATE
- service-evtmgr)
+ service-evtmgr
+ tinyexpr::tinyexpr
+)
M module-apps/application-calculator/data/CalculatorUtility.cpp => module-apps/application-calculator/data/CalculatorUtility.cpp +1 -1
@@ 4,7 4,7 @@
#include "CalculatorUtility.hpp"
#include "application-calculator/data/CalculatorInputProcessor.hpp"
#include "application-calculator/widgets/CalculatorStyle.hpp"
-#include <module-utils/tinyexpr/tinyexpr.h>
+#include <tinyexpr.h>
#include <i18n/i18n.hpp>
#include <Utils.hpp>
#include <cmath>
M module-apps/application-calculator/windows/CalculatorMainWindow.hpp => module-apps/application-calculator/windows/CalculatorMainWindow.hpp +0 -1
@@ 8,7 8,6 @@
#include "application-calculator/data/CalculatorInputProcessor.hpp"
#include "application-calculator/widgets/MathOperationsBox.hpp"
#include <module-gui/gui/widgets/Text.hpp>
-#include <module-utils/tinyexpr/tinyexpr.h>
namespace gui
{
M module-utils/CMakeLists.txt => module-utils/CMakeLists.txt +0 -1
@@ 52,7 52,6 @@ include(segger/rtt/CMakeLists.txt)
include(third-party/re2.cmake)
include(third-party/protobuf-lite.cmake)
include(third-party/libphonenumber.cmake)
-include(third-party/tinyexpr.cmake)
# link against libphonenumber
target_link_libraries (${PROJECT_NAME} PUBLIC ${LIBPHONENUMBER_TARGET})
D module-utils/third-party/tinyexpr.cmake => module-utils/third-party/tinyexpr.cmake +0 -20
@@ 1,20 0,0 @@
-include (thirdparty)
-
-# add tinyexpr library sources
-set (TINYEXPR_SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}/tinyexpr)
-set (TINYEXPR_SOURCES
- ${TINYEXPR_SRCDIR}/tinyexpr.c
-)
-
-# create static library for the third party
-set (TINYEXPR_TARGET tinyexpr)
-add_library (${TINYEXPR_TARGET} STATIC ${TINYEXPR_SOURCES})
-
-# setup flags for the third party
-third_party_target_setup (${TINYEXPR_TARGET})
-
-# add include directory path
-target_include_directories (${TINYEXPR_TARGET} PUBLIC ${TINYEXPR_SRCDIR})
-
-# optimize thirdy party sources in dbeug
-third_party_source_optimization (${TINYEXPR_SOURCES})
D module-utils/tinyexpr => module-utils/tinyexpr +0 -1
@@ 1,1 0,0 @@
-Subproject commit 2ef22d228f8760561b8f485f0997ca07fafd0f12
M third-party/CMakeLists.txt => third-party/CMakeLists.txt +2 -0
@@ 6,3 6,5 @@ add_subdirectory(date)
add_subdirectory(pugixml)
add_subdirectory(sml)
add_subdirectory(minimp3)
+add_subdirectory(tinyexpr)
+
A third-party/tinyexpr/CMakeLists.txt => third-party/tinyexpr/CMakeLists.txt +14 -0
@@ 0,0 1,14 @@
+
+add_library(tinyexpr)
+target_sources(tinyexpr
+ PRIVATE
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/tinyexpr.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/tinyexpr.h
+)
+
+target_include_directories(tinyexpr
+ PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+)
+add_library(tinyexpr::tinyexpr ALIAS tinyexpr)
+
A third-party/tinyexpr/src => third-party/tinyexpr/src +1 -0
@@ 0,0 1,1 @@
+Subproject commit 2ef22d228f8760561b8f485f0997ca07fafd0f12