Skip to content

Commit

Permalink
upgrade dependencies (#35)
Browse files Browse the repository at this point in the history
* upgrade gitalk for code extraction

* adapt CI

* +ctest +cpack +update deps

---------

Signed-off-by: Alexander Diemand <codieplusplus@apax.net>
  • Loading branch information
CodiePP authored Oct 26, 2023
1 parent 9d05a02 commit 1d35a40
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 7 deletions.
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,15 @@ GTAGS
.vscode
.vs

*.swp

CPackConfig.cmake
CPackSourceConfig.cmake
CTestTestfile.cmake
Testing/
_CPack_Packages/
install_manifest.txt

ext/Darwin_arm64
ext/Darwin_amd64
ext/Linux_aarch64
2 changes: 2 additions & 0 deletions build/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -168,5 +168,7 @@ IF(RUN_ADDRESS_SANITIZER)
ENDIF(${CMAKE_BUILD_TYPE} MATCHES "Debug")
ENDIF(RUN_ADDRESS_SANITIZER)

enable_testing()

add_subdirectory( src )
add_subdirectory( test )
9 changes: 5 additions & 4 deletions build/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,13 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
add_executable ( ut${PROJECT_NAME}
${GENERATED_SRCS}
)
add_test(NAME ut${PROJECT_NAME} COMMAND ut${PROJECT_NAME} --show_progress)

add_library(libelykseer-crypto_s STATIC IMPORTED)
set_target_properties(libelykseer-crypto_s PROPERTIES IMPORTED_LOCATION "${CMAKE_HOME_DIRECTORY}/src/libelykseer-crypto_d.a")
add_library(lib${PROJECT_NAME}_s STATIC IMPORTED)
set_target_properties(lib${PROJECT_NAME}_s PROPERTIES IMPORTED_LOCATION "${CMAKE_HOME_DIRECTORY}/src/libelykseer-crypto_d.a")

target_link_libraries ( ut${PROJECT_NAME}
elykseer-crypto_${CMAKE_BUILD_TYPE}
${PROJECT_NAME}_${CMAKE_BUILD_TYPE}
${libs}
${Boost_LIBRARIES}
${CRYPTO_LIBS}
Expand All @@ -51,7 +52,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "DebugProfile")
)
set_target_properties(utp${PROJECT_NAME} PROPERTIES LINK_FLAGS "-fprofile-arcs -ftest-coverage ")
target_link_libraries ( utp${PROJECT_NAME}
elykseer-crypto_p${CMAKE_BUILD_TYPE}
${PROJECT_NAME}_p${CMAKE_BUILD_TYPE}
#gcov
${libs}
${Boost_LIBRARIES}
Expand Down
2 changes: 1 addition & 1 deletion ext/cryptopp
Submodule cryptopp updated 167 files
2 changes: 1 addition & 1 deletion ext/gpgme
Submodule gpgme updated from 72bb46 to 451ed4
2 changes: 1 addition & 1 deletion ext/libassuan
Submodule libassuan updated from f8cfb5 to 6b50ee

0 comments on commit 1d35a40

Please sign in to comment.