File tree Expand file tree Collapse file tree 5 files changed +7
-20
lines changed Expand file tree Collapse file tree 5 files changed +7
-20
lines changed Original file line number Diff line number Diff line change @@ -306,10 +306,6 @@ endif()
306306target_include_directories (libAtomVM PUBLIC ${CMAKE_CURRENT_BINARY_DIR} )
307307configure_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-
313309add_dependencies (libAtomVM generated generated -nifs-hash)
314310
315311if (COVERAGE)
Original file line number Diff line number Diff line change @@ -44,13 +44,11 @@ add_subdirectory(lib)
4444target_include_directories (AtomVM PUBLIC lib/)
4545
4646add_subdirectory (../../libAtomVM libAtomVM)
47- target_link_libraries (AtomVM PRIVATE libAtomVM)
48-
4947set (
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
5553if (AVM_DISABLE_JIT)
5654set (precompiled_suffix)
Original file line number Diff line number Diff line change @@ -69,7 +69,11 @@ define_if_function_exists(libAtomVM${PLATFORM_LIB_SUFFIX} signal "signal.h" PRIV
6969define_if_function_exists(libAtomVM${PLATFORM_LIB_SUFFIX} getservbyname "netdb.h" PRIVATE HAVE_SERVBYNAME)
7070define_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 >)
7377include_directories (${CMAKE_SOURCE_DIR} /src/platforms/generic_unix/lib)
7478
7579include (MbedTLS)
Original file line number Diff line number Diff line change @@ -58,15 +58,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
5858 endif ()
5959endif ()
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-
7061set (
7162 PLATFORM_LIB_SUFFIX
7263 ${CMAKE_SYSTEM_NAME} -${CMAKE_SYSTEM_PROCESSOR}
Original file line number Diff line number Diff line change 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} )
5453target_include_directories (PackBEAM PUBLIC ../../src/libAtomVM)
55- target_link_libraries (PackBEAM PRIVATE libAtomVM)
5654
5755if (COVERAGE)
5856 include (CodeCoverage)
You can’t perform that action at this time.
0 commit comments