From b9694428536149fc4d33543f2f9c23bcde835dd6 Mon Sep 17 00:00:00 2001 From: "Pawel.Paprocki" Date: Mon, 24 May 2021 18:05:30 +0200 Subject: [PATCH] [BH-365] Move TPLIB (tinyexpr) to separate directory Move library, amend CMAKE files --- .gitmodules | 2 +- cmake/modules/PureCoverage.cmake | 1 - .../application-calculator/CMakeLists.txt | 4 +++- .../data/CalculatorUtility.cpp | 2 +- .../windows/CalculatorMainWindow.hpp | 1 - module-utils/CMakeLists.txt | 1 - module-utils/third-party/tinyexpr.cmake | 20 ------------------- third-party/CMakeLists.txt | 2 ++ third-party/tinyexpr/CMakeLists.txt | 14 +++++++++++++ .../tinyexpr => third-party/tinyexpr/src | 0 10 files changed, 21 insertions(+), 26 deletions(-) delete mode 100644 module-utils/third-party/tinyexpr.cmake create mode 100644 third-party/tinyexpr/CMakeLists.txt rename module-utils/tinyexpr => third-party/tinyexpr/src (100%) diff --git a/.gitmodules b/.gitmodules index 8481ce7f44759c230a7e5c6db0148628906f4e4e..5e08bca1a3c8194742485ce17cdaffaf32243ead 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/cmake/modules/PureCoverage.cmake b/cmake/modules/PureCoverage.cmake index d8baef31afcb1fac957a6f7dfc1577b79c3ca2e0..9abfa2bdfdaf7efc8e13029ebba4fa7862f8d0f3 100644 --- a/cmake/modules/PureCoverage.cmake +++ b/cmake/modules/PureCoverage.cmake @@ -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/.* diff --git a/module-apps/application-calculator/CMakeLists.txt b/module-apps/application-calculator/CMakeLists.txt index 7e9a2b0305363c0f5b02eae0bbb8b4922bdfbb5d..92862b6898ff59f48079510fe3afb6dc77eeb16f 100644 --- a/module-apps/application-calculator/CMakeLists.txt +++ b/module-apps/application-calculator/CMakeLists.txt @@ -18,4 +18,6 @@ endif() target_link_libraries(${PROJECT_NAME} PRIVATE - service-evtmgr) + service-evtmgr + tinyexpr::tinyexpr +) diff --git a/module-apps/application-calculator/data/CalculatorUtility.cpp b/module-apps/application-calculator/data/CalculatorUtility.cpp index f875670f177b438f467c4a8b87deee5c6c8054be..9318cb31be5c24457bb07f0c75ad005dd4016887 100644 --- a/module-apps/application-calculator/data/CalculatorUtility.cpp +++ b/module-apps/application-calculator/data/CalculatorUtility.cpp @@ -4,7 +4,7 @@ #include "CalculatorUtility.hpp" #include "application-calculator/data/CalculatorInputProcessor.hpp" #include "application-calculator/widgets/CalculatorStyle.hpp" -#include +#include #include #include #include diff --git a/module-apps/application-calculator/windows/CalculatorMainWindow.hpp b/module-apps/application-calculator/windows/CalculatorMainWindow.hpp index 8022f2a37836542d2a4cac9b19942de248504246..e19a9eba375addc537ac4b03c806a3815a068371 100644 --- a/module-apps/application-calculator/windows/CalculatorMainWindow.hpp +++ b/module-apps/application-calculator/windows/CalculatorMainWindow.hpp @@ -8,7 +8,6 @@ #include "application-calculator/data/CalculatorInputProcessor.hpp" #include "application-calculator/widgets/MathOperationsBox.hpp" #include -#include namespace gui { diff --git a/module-utils/CMakeLists.txt b/module-utils/CMakeLists.txt index a875ad046d7721c27f9711e61c7c64397681a4a9..eb850016d1177ef145067c6409d4c1600ad0d10f 100644 --- a/module-utils/CMakeLists.txt +++ b/module-utils/CMakeLists.txt @@ -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}) diff --git a/module-utils/third-party/tinyexpr.cmake b/module-utils/third-party/tinyexpr.cmake deleted file mode 100644 index 628937282a46b8c17649a3eeabc7da022a9dec9a..0000000000000000000000000000000000000000 --- a/module-utils/third-party/tinyexpr.cmake +++ /dev/null @@ -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}) diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 9ea7536f9ed75be9becb5f149dd2fa9c9c9f3e4b..9b9e1df531aa51d60bfdbadf843c95f8768685bd 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -6,3 +6,5 @@ add_subdirectory(date) add_subdirectory(pugixml) add_subdirectory(sml) add_subdirectory(minimp3) +add_subdirectory(tinyexpr) + diff --git a/third-party/tinyexpr/CMakeLists.txt b/third-party/tinyexpr/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..5f0f8e6f36f52b1be3c85f4fc0d1e56cde7051f5 --- /dev/null +++ b/third-party/tinyexpr/CMakeLists.txt @@ -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 + $ +) +add_library(tinyexpr::tinyexpr ALIAS tinyexpr) + diff --git a/module-utils/tinyexpr b/third-party/tinyexpr/src similarity index 100% rename from module-utils/tinyexpr rename to third-party/tinyexpr/src