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 8d8cf76 commit 694d000
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,6 @@
[submodule "third_party/libwebsockets"]
path = third_party/libwebsockets
url = https://github.com/warmcat/libwebsockets.git
[submodule "third_party/crypto-algorithms"]
path = third_party/crypto-algorithms
url = https://github.com/B-Con/crypto-algorithms.git
17 changes: 10 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -701,8 +701,10 @@ add_executable(${PROJECT_NAME}

./third_party/mustache/mustache.hpp
./third_party/spdlog/include/
./third_party/fastpbkdf2/fastpbkdf2.h
./third_party/fastpbkdf2/fastpbkdf2.c
# ./third_party/fastpbkdf2/fastpbkdf2.h
# ./third_party/fastpbkdf2/fastpbkdf2.c
./third_party/crypto-algorithms/sha256.h
./third_party/crypto-algorithms/sha256.c
install/${PROJECT_NAME}.desktop
${TS_FILES}
)
Expand All @@ -721,9 +723,10 @@ include_directories( PUBLIC ./src
./third_party
./third_party/nlohmann/include/
./third_party/spdlog/include/
./third_party/mustache/
./third_party/Mustache/
./third_party/maddy/include/
./third_party/fastpbkdf2/
#./third_party/fastpbkdf2/
./third_party/crypto-algorithms/
${PThreads4W_INCLUDE_DIR}
${Qt5Widgets_INCLUDE_DIRS}
${Qt5Core_INCLUDE_DIRS}
Expand Down Expand Up @@ -753,7 +756,8 @@ include_directories( PUBLIC ./src
./third_party/spdlog/include/
./third_party/mustache/
./third_party/maddy/include/
./third_party/fastpbkdf2/
# ./third_party/fastpbkdf2/
./third_party/crypto-algorithms/s
${Qt5Core_INCLUDE_DIRS}
${Qt5SerialBus_INCLUDE_DIRS}
${Qt5SerialPort_INCLUDE_DIRS}
Expand Down Expand Up @@ -813,9 +817,8 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
OpenSSL::SSL
OpenSSL::Crypto
${OPENSSL_LIBRARIES}
# ${PAHO_LIBRARIES}
${MOSQUITTO_LIBRARIES}
# ${LIBWEBSOCKETS_LIBRARIES}
${LIBWEBSOCKETS_LIBRARIES}
${EXPAT_LIBRARIES}
${CURL_LIBRARIES}
${DLFCN_LIBS}
Expand Down
1 change: 1 addition & 0 deletions third_party/crypto-algorithms
Submodule crypto-algorithms added at cfbde4

0 comments on commit 694d000

Please sign in to comment.