Skip to content

Fix CMake targets include path propagation #414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FredeHoey wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −29
Open

Fix CMake targets include path propagation #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,16 +320,16 @@ endif(BUILD_TESTS)
configure_file(atca_config.h.in atca_config.h @ONLY)
set(LIB_INC ${LIB_INC} ${CMAKE_CURRENT_BINARY_DIR}/atca_config.h)

include_directories(cryptoauth PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/downloaded
../app/tng
../third_party
../third_party/hidapi/hidapi
${USB_INCLUDE_DIR})
target_include_directories(cryptoauth PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/downloaded
../app/tng
../third_party
../third_party/hidapi/hidapi
${USB_INCLUDE_DIR})

if(APPLE)
include_directories(cryptoauth PUBLIC ../third_party/hidapi/mac)
target_include_directories(cryptoauth PUBLIC ../third_party/hidapi/mac)
endif()

if(ATCA_MBEDTLS)
Expand All @@ -341,7 +341,7 @@ target_link_libraries(cryptoauth wolfssl)
endif()

if(ATCA_OPENSSL)
include_directories(cryptoauth PUBLIC ${OPENSSL_INCLUDE_DIR})
target_include_directories(cryptoauth PUBLIC ${OPENSSL_INCLUDE_DIR})
target_link_libraries(cryptoauth ${OPENSSL_CRYPTO_LIBRARY})
endif()

Expand Down
2 changes: 1 addition & 1 deletion lib/cmake/mbedtls.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ target_compile_definitions(mbedtls PUBLIC -DMBEDTLS_X509_ALLOW_UNSUPPORTED_CRITI
if(NOT MSVC)
target_compile_options(mbedtls PRIVATE -fPIC)
endif()
include_directories(mbedtls PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
target_include_directories(mbedtls PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/downloaded/mbedtls/include)
endif()

Expand Down
6 changes: 3 additions & 3 deletions lib/cmake/wolfssl.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ if(NOT MSVC)
target_compile_options(wolfssl PRIVATE -fPIC)
endif()

include_directories(wolfssl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/downloaded/wolfssl
${CMAKE_CURRENT_BINARY_DIR})
target_include_directories(wolfssl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/downloaded/wolfssl
${CMAKE_CURRENT_BINARY_DIR})


file(GLOB WOLFSSL_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "wolfssl/*.c")
Expand Down
33 changes: 17 additions & 16 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,23 @@ endif()

add_executable(cryptoauth_test ${CRYPTOAUTH_TEST_SRC} ${UNITY_SRC})

include_directories(cryptoauth_test ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/downloaded
${CMAKE_BINARY_DIR}/downloaded/wolfssl
${CMAKE_BINARY_DIR}/downloaded/mbedtls/include
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_SOURCE_DIR}/api_atcab
${CMAKE_CURRENT_SOURCE_DIR}/api_calib
${CMAKE_CURRENT_SOURCE_DIR}/api_crypto
${CMAKE_CURRENT_SOURCE_DIR}/api_talib
${CMAKE_CURRENT_SOURCE_DIR}/hal
${CMAKE_CURRENT_SOURCE_DIR}/integration
${CMAKE_CURRENT_SOURCE_DIR}/../lib
${CMAKE_CURRENT_SOURCE_DIR}/../third_party
${CMAKE_CURRENT_SOURCE_DIR}/../third_party/mbedtls/include
${CMAKE_CURRENT_SOURCE_DIR}/../third_party/wolfssl
${CMAKE_CURRENT_BINARY_DIR}/../lib)
target_include_directories(cryptoauth_test PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/downloaded
${CMAKE_BINARY_DIR}/downloaded/wolfssl
${CMAKE_BINARY_DIR}/downloaded/mbedtls/include
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_SOURCE_DIR}/api_atcab
${CMAKE_CURRENT_SOURCE_DIR}/api_calib
${CMAKE_CURRENT_SOURCE_DIR}/api_crypto
${CMAKE_CURRENT_SOURCE_DIR}/api_talib
${CMAKE_CURRENT_SOURCE_DIR}/hal
${CMAKE_CURRENT_SOURCE_DIR}/integration
${CMAKE_CURRENT_SOURCE_DIR}/../lib
${CMAKE_CURRENT_SOURCE_DIR}/../third_party
${CMAKE_CURRENT_SOURCE_DIR}/../third_party/mbedtls/include
${CMAKE_CURRENT_SOURCE_DIR}/../third_party/wolfssl
${CMAKE_CURRENT_BINARY_DIR}/../lib)

target_link_libraries(cryptoauth_test cryptoauth)

Expand Down