Skip to content

Fix duplicate linked objects warnings #1874

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix duplicate linked objects warnings #1874

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
4 changes: 0 additions & 4 deletions src/libAtomVM/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,10 +306,6 @@ endif()
target_include_directories(libAtomVM PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/avm_version.h)

if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Generic")
target_link_libraries(libAtomVM PUBLIC libAtomVM${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
endif()

add_dependencies(libAtomVM generated generated-nifs-hash)

if (COVERAGE)
Expand Down
4 changes: 1 addition & 3 deletions src/platforms/generic_unix/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,11 @@ add_subdirectory(lib)
target_include_directories(AtomVM PUBLIC lib/)

add_subdirectory(../../libAtomVM libAtomVM)
target_link_libraries(AtomVM PRIVATE libAtomVM)

set(
PLATFORM_LIB_SUFFIX
${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}
)
target_link_libraries(AtomVM PRIVATE libAtomVM${PLATFORM_LIB_SUFFIX})
target_link_libraries(AtomVM PRIVATE libAtomVM${PLATFORM_LIB_SUFFIX} libAtomVM)

if(AVM_DISABLE_JIT)
set(precompiled_suffix)
Expand Down
6 changes: 5 additions & 1 deletion src/platforms/generic_unix/lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,11 @@ define_if_function_exists(libAtomVM${PLATFORM_LIB_SUFFIX} signal "signal.h" PRIV
define_if_function_exists(libAtomVM${PLATFORM_LIB_SUFFIX} getservbyname "netdb.h" PRIVATE HAVE_SERVBYNAME)
define_if_function_exists(libAtomVM${PLATFORM_LIB_SUFFIX} gethostname "unistd.h" PRIVATE HAVE_GETHOSTNAME)

target_link_libraries(libAtomVM${PLATFORM_LIB_SUFFIX} PUBLIC libAtomVM)
# Get include directories and compile definitions from libAtomVM without linking
target_include_directories(libAtomVM${PLATFORM_LIB_SUFFIX} PRIVATE
$<TARGET_PROPERTY:libAtomVM,INTERFACE_INCLUDE_DIRECTORIES>)
target_compile_definitions(libAtomVM${PLATFORM_LIB_SUFFIX} PRIVATE
$<TARGET_PROPERTY:libAtomVM,INTERFACE_COMPILE_DEFINITIONS>)
include_directories(${CMAKE_SOURCE_DIR}/src/platforms/generic_unix/lib)

include(MbedTLS)
Expand Down
19 changes: 5 additions & 14 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
endif()
endif()

include(MbedTLS)
if (MbedTLS_FOUND)
target_link_libraries(test-erlang PRIVATE MbedTLS::mbedtls)
target_link_libraries(test-enif PRIVATE MbedTLS::mbedtls)
target_link_libraries(test-heap PRIVATE MbedTLS::mbedtls)
target_link_libraries(test-mailbox PRIVATE MbedTLS::mbedtls)
target_link_libraries(test-structs PRIVATE MbedTLS::mbedtls)
endif()

set(
PLATFORM_LIB_SUFFIX
${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}
Expand All @@ -90,11 +81,11 @@ target_include_directories(test-enif PRIVATE ../src/libAtomVM)
target_include_directories(test-heap PRIVATE ../src/libAtomVM)
target_include_directories(test-mailbox PRIVATE ../src/libAtomVM)
target_include_directories(test-structs PRIVATE ../src/libAtomVM)
target_link_libraries(test-erlang PRIVATE libAtomVM libAtomVM${PLATFORM_LIB_SUFFIX})
target_link_libraries(test-enif PRIVATE libAtomVM libAtomVM${PLATFORM_LIB_SUFFIX})
target_link_libraries(test-heap PRIVATE libAtomVM libAtomVM${PLATFORM_LIB_SUFFIX})
target_link_libraries(test-mailbox PRIVATE libAtomVM libAtomVM${PLATFORM_LIB_SUFFIX})
target_link_libraries(test-structs PRIVATE libAtomVM libAtomVM${PLATFORM_LIB_SUFFIX})
target_link_libraries(test-erlang PRIVATE libAtomVM${PLATFORM_LIB_SUFFIX} libAtomVM)
target_link_libraries(test-enif PRIVATE libAtomVM${PLATFORM_LIB_SUFFIX} libAtomVM)
target_link_libraries(test-heap PRIVATE libAtomVM${PLATFORM_LIB_SUFFIX} libAtomVM)
target_link_libraries(test-mailbox PRIVATE libAtomVM${PLATFORM_LIB_SUFFIX} libAtomVM)
target_link_libraries(test-structs PRIVATE libAtomVM${PLATFORM_LIB_SUFFIX} libAtomVM)

# Except for XCode, also compile beams
if (NOT "${CMAKE_GENERATOR}" MATCHES "Xcode")
Expand Down
4 changes: 1 addition & 3 deletions tools/packbeam/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,8 @@ set(
PLATFORM_LIB_SUFFIX
${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}
)
target_link_libraries(PackBEAM PRIVATE libAtomVM${PLATFORM_LIB_SUFFIX})

target_link_libraries(PackBEAM PRIVATE libAtomVM${PLATFORM_LIB_SUFFIX} libAtomVM)
target_include_directories(PackBEAM PUBLIC ../../src/libAtomVM)
target_link_libraries(PackBEAM PRIVATE libAtomVM)

if (COVERAGE)
include(CodeCoverage)
Expand Down
Loading