Skip to content

Commit bfd02ff

Browse files
committed
Fix duplicate linked objects warnings
Signed-off-by: Paul Guyot <[email protected]>
1 parent e824db0 commit bfd02ff

File tree

5 files changed

+7
-20
lines changed

5 files changed

+7
-20
lines changed

src/libAtomVM/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,10 +306,6 @@ endif()
306306
target_include_directories(libAtomVM PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
307307
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/avm_version.h)
308308

309-
if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Generic")
310-
target_link_libraries(libAtomVM PUBLIC libAtomVM${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
311-
endif()
312-
313309
add_dependencies(libAtomVM generated generated-nifs-hash)
314310

315311
if (COVERAGE)

src/platforms/generic_unix/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,11 @@ add_subdirectory(lib)
4444
target_include_directories(AtomVM PUBLIC lib/)
4545

4646
add_subdirectory(../../libAtomVM libAtomVM)
47-
target_link_libraries(AtomVM PRIVATE libAtomVM)
48-
4947
set(
5048
PLATFORM_LIB_SUFFIX
5149
${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}
5250
)
53-
target_link_libraries(AtomVM PRIVATE libAtomVM${PLATFORM_LIB_SUFFIX})
51+
target_link_libraries(AtomVM PRIVATE libAtomVM libAtomVM${PLATFORM_LIB_SUFFIX})
5452

5553
if(AVM_DISABLE_JIT)
5654
set(precompiled_suffix)

src/platforms/generic_unix/lib/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,11 @@ define_if_function_exists(libAtomVM${PLATFORM_LIB_SUFFIX} signal "signal.h" PRIV
6969
define_if_function_exists(libAtomVM${PLATFORM_LIB_SUFFIX} getservbyname "netdb.h" PRIVATE HAVE_SERVBYNAME)
7070
define_if_function_exists(libAtomVM${PLATFORM_LIB_SUFFIX} gethostname "unistd.h" PRIVATE HAVE_GETHOSTNAME)
7171

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

7579
include(MbedTLS)

tests/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
5858
endif()
5959
endif()
6060

61-
include(MbedTLS)
62-
if (MbedTLS_FOUND)
63-
target_link_libraries(test-erlang PRIVATE MbedTLS::mbedtls)
64-
target_link_libraries(test-enif PRIVATE MbedTLS::mbedtls)
65-
target_link_libraries(test-heap PRIVATE MbedTLS::mbedtls)
66-
target_link_libraries(test-mailbox PRIVATE MbedTLS::mbedtls)
67-
target_link_libraries(test-structs PRIVATE MbedTLS::mbedtls)
68-
endif()
69-
7061
set(
7162
PLATFORM_LIB_SUFFIX
7263
${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}

tools/packbeam/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,8 @@ set(
4949
PLATFORM_LIB_SUFFIX
5050
${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}
5151
)
52-
target_link_libraries(PackBEAM PRIVATE libAtomVM${PLATFORM_LIB_SUFFIX})
53-
52+
target_link_libraries(PackBEAM PRIVATE libAtomVM libAtomVM${PLATFORM_LIB_SUFFIX})
5453
target_include_directories(PackBEAM PUBLIC ../../src/libAtomVM)
55-
target_link_libraries(PackBEAM PRIVATE libAtomVM)
5654

5755
if (COVERAGE)
5856
include(CodeCoverage)

0 commit comments

Comments
 (0)