Skip to content

Commit

Permalink
cmake: remove hacky work around for tinycbor
Browse files Browse the repository at this point in the history
  • Loading branch information
postables committed Jul 24, 2020
1 parent 192a68c commit 23e9231
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ if(NOT CMAKE_BUILD_TYPE)
list(APPEND flags -std=c17 -Wall -Wextra -Werror -pedantic)
endif()

find_library(TINYCBOR_LIB
tinycbor
PATHS /home/travis/build/RTradeLtd/libcp2p/tinycbor
)

list(APPEND flags -D_POSIX_C_SOURCE=201112L)

set(CMAKE_C_FLAGS_RELEASE "")
Expand Down
7 changes: 1 addition & 6 deletions cmake/libraries/crypto.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,8 @@ target_link_libraries(libcrypto mbedtls)
target_link_libraries(libcrypto mbedx509)
target_link_libraries(libcrypto mbedcrypto)
target_link_libraries(libcrypto libmultibase)
target_link_libraries(libcrypto tinycbor)

if (CMAKE_BUILD_TYPE STREQUAL "CI")
target_link_libraries(libcrypto TINYCBOR_LIB)
endif()
if (NOT CMAKE_BUILD_TYPE STREQUAL "CI")
target_link_libraries(libcrypto tinycbor)
endif()


add_executable(libcrypto-test ./src/crypto/crypto_test.c)
Expand Down

0 comments on commit 23e9231

Please sign in to comment.