Skip to content

Commit

Permalink
removed fastpbkdf2 dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
grodansparadis committed May 5, 2024
1 parent 49bfe0b commit 8a6ca4c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

steps:
# https://github.com/actions/checkout
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: development
submodules: recursive
Expand Down
10 changes: 2 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ set(PACKAGE_AUTHOR "Ake Hedman, the VSCP Project")

# Version settings
if(NOT DEFINED MAJOR_VERSION)
SET(MAJOR_VERSION "15")
SET(MAJOR_VERSION "16")
endif()
if(NOT DEFINED MINOR_VERSION)
SET(MINOR_VERSION "0")
endif()
if(NOT DEFINED PATCH_VERSION)
SET(PATCH_VERSION "2")
SET(PATCH_VERSION "0")
endif()

add_subdirectory(./third_party/spdlog/)
Expand Down Expand Up @@ -253,8 +253,6 @@ add_library(libvscphelper SHARED
./windows/libvscphelper.cpp
./third_party/mustache/mustache.hpp
./third_party/spdlog/include
./third_party/fastpbkdf2/fastpbkdf2.h
./third_party/fastpbkdf2/fastpbkdf2.c
${VSCP_PATH}/src/vscp/common/vscp.h
${VSCP_PATH}/src/vscp/common/vscpremotetcpif.h
${VSCP_PATH}/src/vscp/common/vscpremotetcpif.cpp
Expand Down Expand Up @@ -286,8 +284,6 @@ else()
./linux/libvscphelper.cpp
./third_party/mustache/mustache.hpp
./third_party/spdlog/include
./third_party/fastpbkdf2/fastpbkdf2.h
./third_party/fastpbkdf2/fastpbkdf2.c
${VSCP_PATH}/src/vscp/common/vscp.h
${VSCP_PATH}/src/vscp/common/vscpremotetcpif.h
${VSCP_PATH}/src/vscp/common/vscpremotetcpif.cpp
Expand Down Expand Up @@ -346,7 +342,6 @@ if (WIN32)
${VSCP_PATH}/src/common/third_party
./third_party/nlohmann/include/
./third_party/spdlog/include
./third_party/fastpbkdf2/
${PThreads4W_INCLUDE_DIR}
${CMAKE_BINARY_DIR}
${OPENSSL_INCLUDE_DIR}
Expand All @@ -359,7 +354,6 @@ else()
${VSCP_PATH}/src/common/third_party
./third_party/nlohmann/include/
./third_party/spdlog/include/
./third_party/fastpbkdf2/
${CMAKE_BINARY_DIR}
${OPENSSL_INCLUDE_DIR}
${LOCAL_SYSLOG_INCLUDE} )
Expand Down

0 comments on commit 8a6ca4c

Please sign in to comment.