Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
719e65b
Add depdency install through taskfile
sitaowang1998 Apr 15, 2025
a1a829c
Remove catch2 submodule
sitaowang1998 Apr 15, 2025
ed93185
Update cmake to use dependencies installed through tasks
sitaowang1998 Apr 15, 2025
c03700d
Add dep_install in lib_install to satisfy GH workflow
sitaowang1998 Apr 15, 2025
c7de69c
Add abseil in deps tasks
sitaowang1998 Apr 15, 2025
ad3a40a
Remove abseil from submodule and submodules directory
sitaowang1998 Apr 15, 2025
1d7d607
Rename abseil lib name
sitaowang1998 Apr 15, 2025
cff7ade
Update cmake for abseil installed by tasks
sitaowang1998 Apr 15, 2025
b94aff5
Add PIC in dependency
sitaowang1998 Apr 15, 2025
0c592b5
Update setup in README
sitaowang1998 Apr 17, 2025
e440753
Add task to download ystdlib source
sitaowang1998 Apr 15, 2025
d22fab8
Add ystdlib-cpp in cmake
sitaowang1998 Apr 15, 2025
464dee8
Update clang format with ystdlib library
sitaowang1998 Apr 16, 2025
32f4cdf
Remove unused git submodule file
sitaowang1998 Apr 21, 2025
57a813c
Remove sumodule checkout in GH workflows
sitaowang1998 Apr 21, 2025
5d03504
Revert "Remove sumodule checkout in GH workflows"
sitaowang1998 Apr 21, 2025
54f45d3
Revert "Remove unused git submodule file"
sitaowang1998 Apr 21, 2025
da30d3d
Fix clang tidy task for example code
sitaowang1998 Apr 21, 2025
c28ed52
Update yscope-dev-utils version for install deps and generate settings
sitaowang1998 Apr 21, 2025
1c78960
Use cmake install-deps-and-generate-settings to install dependencies
sitaowang1998 Apr 21, 2025
a47cb8f
Fix clang tidy for global variable
sitaowang1998 Apr 21, 2025
e4761d2
Use heredoc for instead of echo
sitaowang1998 Apr 22, 2025
169e0a7
fix clang tidy for global variable
sitaowang1998 Apr 22, 2025
03a14ee
Fix heredoc indentation
sitaowang1998 Apr 22, 2025
400a56d
Remove unnecessary global variables
sitaowang1998 Apr 22, 2025
bfd54d5
Add top level project check around including dependencies
sitaowang1998 Apr 22, 2025
69d106e
Improve example cmake by using absolute path
sitaowang1998 Apr 22, 2025
ce9abf8
Add tasks to install fmtlib, spdlog, msgpack and mariadb-connector-cp…
sitaowang1998 Apr 23, 2025
ecd2c69
Increase GH workflow install dependencies timeout
sitaowang1998 Apr 23, 2025
1b12944
Removed unused install scripts
sitaowang1998 Apr 23, 2025
4c76852
Debug commit for GH workflow
sitaowang1998 Apr 23, 2025
d541e78
Fix find mariadb cmake for GH workflow
sitaowang1998 Apr 23, 2025
c9113d0
Add boost download
sitaowang1998 Apr 23, 2025
431243e
Merge branch 'main' into script_to_task
sitaowang1998 Apr 23, 2025
3e7cf51
Add boost install tasks
sitaowang1998 Apr 23, 2025
d56f1a5
Remove boost install script and install-lib script
sitaowang1998 Apr 23, 2025
055fff9
Add install libmariadb-dev in install-dev script
sitaowang1998 Apr 23, 2025
92840e1
Add quote in scripts to guard against space in path
sitaowang1998 Apr 23, 2025
9b0b025
Add pkgconfig back in find mariadb library
sitaowang1998 Apr 23, 2025
6170706
Revert timeout change in GH workflows.
sitaowang1998 Apr 24, 2025
d260b90
Improve boost task docstring.
sitaowang1998 Apr 24, 2025
0bc409e
Improve boost task docstring.
sitaowang1998 Apr 24, 2025
928492c
Remove test, example and doc building to reduce build time
sitaowang1998 Apr 24, 2025
4b95b24
Add all dependencies into install-all task and reorder them
sitaowang1998 Apr 24, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ COPY ./tools/scripts/lib_install ./tools/scripts/lib_install

RUN ./tools/scripts/lib_install/linux/install-dev.sh

RUN ./tools/scripts/lib_install/linux/install-lib.sh

# NOTE:
# `task` doesn't have an apt/yum package so we use its install script.
RUN sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ if(spdlog_FOUND)
message(STATUS "Found spdlog ${spdlog_VERSION}")
else()
if(SPIDER_USE_STATIC_LIBS)
message(FATAL_ERROR "Could not find static libraries for spdlog.`")
message(FATAL_ERROR "Could not find static libraries for spdlog.")
else()
message(FATAL_ERROR "Could not find libraries for spdlog.")
endif()
Expand Down
15 changes: 7 additions & 8 deletions cmake/Modules/FindMariaDBClientCpp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@ pkg_check_modules(mariadbclientcpp_PKGCONF QUIET "lib${mariadbclientcpp_LIBNAME}
# Set include directory
find_path(
MariaDBClientCpp_INCLUDE_DIR
conncpp.hpp
mariadb/conncpp.hpp
HINTS
${mariadbclientcpp_PKGCONF_INCLUDEDIR}
${mariadb-connector-cpp_ROOT}
PATH_SUFFIXES
mariadb
include
)

# Handle static libraries
Expand All @@ -52,19 +53,17 @@ find_library(
${mariadbclientcpp_LIBNAME}
HINTS
${mariadbclientcpp_PKGCONF_LIBDIR}
${mariadb-connector-cpp_ROOT}
PATH_SUFFIXES
mariadb
lib
lib/${CMAKE_LIBRARY_ARCHITECTURE}
)
if(MariaDBClientCpp_LIBRARY)
# NOTE: This must be set for find_package_handle_standard_args to work
set(MariaDBClientCpp_FOUND ON)
endif()

if(MariaDBClientCpp_USE_STATIC_LIBS)
findstaticlibrarydependencies(${mariadbclientcpp_LIBNAME} mariadbclientcpp
"${mariadbclientcpp_PKGCONF_STATIC_LIBRARIES}"
)

# Restore original value of CMAKE_FIND_LIBRARY_SUFFIXES
set(CMAKE_FIND_LIBRARY_SUFFIXES ${mariadbclientcpp_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
unset(mariadbclientcpp_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES)
Expand Down Expand Up @@ -104,7 +103,7 @@ if(NOT TARGET MariaDBClientCpp::MariaDBClientCpp)
MariaDBClientCpp::MariaDBClientCpp
PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES
"${MariaDBClientCpp_INCLUDE_DIR};${MariaDBClientCpp_INCLUDE_DIR}/conncpp;${MariaDBClientCpp_INCLUDE_DIR}/conncpp/compat"
"${MariaDBClientCpp_INCLUDE_DIR}"
)
endif()

Expand Down
130 changes: 0 additions & 130 deletions cmake/Modules/Findspdlog.cmake

This file was deleted.

Loading