tqcq/ulib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat/support_orm #1

Merged
tqcq merged 5 commits from feat/support_orm into develop 2024-01-06 21:01:45 +08:00
Conversation 0 Commits 5 Files Changed 7 +15 -3
7 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/build.yaml
View File

@ -93,5 +93,5 @@ jobs:
run: | run: |
cd ${{ github.workspace }} cd ${{ github.workspace }}
sudo apt-get update sudo apt-get update
sudo apt-get install -y libarchive-dev libssl-dev autoconf libtool pkg-config cmake make gcc g++ sudo apt-get install -y libarchive-dev libssl-dev autoconf libtool pkg-config cmake make gcc g++ git
${{ env.build_command }} ${{ env.build_command }}

2
.gitea/workflows/linux-hisiv500-gcc.yaml
View File

@ -79,7 +79,7 @@ jobs:
run: | run: |
cd ${{ github.workspace }} cd ${{ github.workspace }}
sudo apt-get update sudo apt-get update
sudo apt-get install -y libarchive-dev libssl-dev autoconf libtool pkg-config cmake make gcc g++ sudo apt-get install -y libarchive-dev libssl-dev autoconf libtool pkg-config cmake make gcc g++ git
cmake . -Bbuild -DCMAKE_TOOLCHAIN_FILE=toolchains/hisiv500.toolchain.cmake -DULIB_BUILD_TESTS=OFF -DCMAKE_CROSSCOMPILING_EMULATOR="qemu-arm;-L;/opt/hisi-linux/x86-arm/arm-hisiv500-linux/" cmake . -Bbuild -DCMAKE_TOOLCHAIN_FILE=toolchains/hisiv500.toolchain.cmake -DULIB_BUILD_TESTS=OFF -DCMAKE_CROSSCOMPILING_EMULATOR="qemu-arm;-L;/opt/hisi-linux/x86-arm/arm-hisiv500-linux/"
cmake --build build --target all -- -j `nproc` cmake --build build --target all -- -j `nproc`

4
.gitmodules vendored
View File

@ -2,3 +2,7 @@
path = 3party/googletest path = 3party/googletest
url = https://code.uocat.com/3party/googletest url = https://code.uocat.com/3party/googletest
branch = release-1.7.0 branch = release-1.7.0
[submodule "3party/sqlpp11"]
path = 3party/sqlpp11
url = https://code.uocat.com/3party/sqlpp11
branch = 0.64

1
3party/sqlpp11 Submodule

@ -0,0 +1 @@
Subproject commit 7f04435576036fc3f06d929760b5c7623485f069

3
CMakeLists.txt
View File

@ -68,6 +68,7 @@ set(FMT_USE_CPP11 OFF CACHE BOOL "Use C++11" FORCE)
set(FMT_TEST OFF CACHE BOOL "Build tests" FORCE) set(FMT_TEST OFF CACHE BOOL "Build tests" FORCE)
set(FMT_USE_CPP11 OFF CACHE BOOL "Use C++11" FORCE) set(FMT_USE_CPP11 OFF CACHE BOOL "Use C++11" FORCE)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/3party/fmt) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/3party/fmt)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/3party/sqlpp11)
set(JSONCPP_WITH_TESTS OFF) set(JSONCPP_WITH_TESTS OFF)
set(JSONCPP_WITH_POST_BUILD_UNITTEST OFF) set(JSONCPP_WITH_POST_BUILD_UNITTEST OFF)
@ -82,7 +83,7 @@ target_sources(${PROJECT_NAME} PRIVATE
src/ulib/log/log.cpp src/ulib/log/log.cpp
src/ulib/log/level.cpp src/ulib/log/level.cpp
) )
target_link_libraries(${PROJECT_NAME} PUBLIC fmt::fmt jsoncpp_static) target_link_libraries(${PROJECT_NAME} PUBLIC fmt::fmt jsoncpp_static sqlpp11::sqlpp11)
target_compile_definitions(${PROJECT_NAME} PRIVATE ULIB_LIBRARY_IMPL) target_compile_definitions(${PROJECT_NAME} PRIVATE ULIB_LIBRARY_IMPL)
target_include_directories(${PROJECT_NAME} PUBLIC target_include_directories(${PROJECT_NAME} PUBLIC
3party/inja 3party/inja

5
tests/3party/sqlpp11/sqlpp11_unittest.cpp Normal file
View File

@ -0,0 +1,5 @@
#include <gtest/gtest.h>
#include <sqlpp11/select.h>
#include <sqlpp11/alias_provider.h>
TEST(sqlpp11, select) { select(sqlpp::value(false).as(sqlpp::alias::a)); }

1
tests/CMakeLists.txt
View File

@ -14,6 +14,7 @@ add_executable(ulib_test
ulib/system/timer_unittest.cpp ulib/system/timer_unittest.cpp
3party/inja/inja_unittest.cpp 3party/inja/inja_unittest.cpp
3party/optional/optional_unittest.cpp 3party/optional/optional_unittest.cpp
3party/sqlpp11/sqlpp11_unittest.cpp
ulib/utils/defer_unittest.cpp ulib/utils/defer_unittest.cpp
) )
target_link_libraries(ulib_test PRIVATE target_link_libraries(ulib_test PRIVATE