Prechádzať zdrojové kódy

Adds additional objects to target_libraries, and fixes that the platform name is used for the platform library

CapXilinx 12 rokov pred
rodič
commit
52cc60400f

+ 2 - 2
src/ports/POSIX/CMakeLists.txt

@@ -14,8 +14,8 @@ opener_platform_support("INCLUDES")
 
 set (PLATFORMLIBNAME ${OpENer_PLATFORM}PLATFORM)
 
-add_library( PLATFORMLIBNAME ${PLATFORM_SPEC_SRC})
+add_library( ${PLATFORMLIBNAME} ${PLATFORM_SPEC_SRC})
 
 add_executable(OpENer main.c)
 
-target_link_libraries( OpENer PLATFORMLIBNAME CIP SAMPLE_APP ENET_ENCAP ${PLATFORM_SPEC_LIBS} )
+target_link_libraries( OpENer ${PLATFORMLIBNAME} CIP SAMPLE_APP ENET_ENCAP ${PLATFORM_SPEC_LIBS} ${OpENer_ADD_CIP_OBJECTS})

+ 2 - 4
src/ports/WIN32/CMakeLists.txt

@@ -13,12 +13,10 @@ opener_common_includes()
 
 opener_platform_support("INCLUDES")
 
-opener_platform_support("INCLUDES")
-
 set (PLATFORMLIBNAME ${OpENer_PLATFORM}PLATFORM)
 
-add_library( PLATFORMLIBNAME ${PLATFORM_SPEC_SRC}) 
+add_library( ${PLATFORMLIBNAME} ${PLATFORM_SPEC_SRC}) 
 
 add_executable(OpENer main.c)
 
-target_link_libraries( OpENer PLATFORMLIBNAME CIP SAMPLE_APP ENET_ENCAP ws2_32 )
+target_link_libraries( OpENer ${PLATFORMLIBNAME} CIP SAMPLE_APP ENET_ENCAP ws2_32 ${OpENer_CIP_OBJECTS} )