Parcourir la source

Fixes drop in mechanism for multiple objects

Adds the additional objects directories to include path for dependencies
between objects, and fixes the mechanism for multiple objects

Signed-off-by: Martin Melik Merkumians <melik-merkumians@acin.tuwien.ac.at>
Martin Melik Merkumians il y a 6 ans
Parent
commit
96ff85774d
2 fichiers modifiés avec 10 ajouts et 1 suppressions
  1. 1 0
      source/CMakeLists.txt
  2. 9 1
      source/src/ports/POSIX/CMakeLists.txt

+ 1 - 0
source/CMakeLists.txt

@@ -105,6 +105,7 @@ set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall" )
 # Internal cache holding the available CIP objects #
 ####################################################
 set( OpENer_ADD_CIP_OBJECTS "" CACHE INTERNAL STRING )
+set( OpENer_ADD_CIP_OBJECTS_INCLUDES "" CACHE INTERNAL STRING )
 
 #######################################
 # Add custom CIP objects              #

+ 9 - 1
source/src/ports/POSIX/CMakeLists.txt

@@ -42,4 +42,12 @@ endif()
 
 add_executable(OpENer main.c)
 message(STATUS "All additional activated objects ${OpENer_ADD_CIP_OBJECTS}")
-target_link_libraries( OpENer CIP Utils SAMPLE_APP ENET_ENCAP PLATFORM_GENERIC ${OpENer_PLATFORM}PLATFORM ${PLATFORM_SPEC_LIBS} ${OpENer_ADD_CIP_OBJECTS} rt cap pthread)
+
+string(REPLACE " " ";" OpENer_ADD_CIP_OBJECTS_LIST ${OpENer_ADD_CIP_OBJECTS} )
+
+target_link_libraries( OpENer CIP Utils SAMPLE_APP ENET_ENCAP PLATFORM_GENERIC ${OpENer_PLATFORM}PLATFORM ${PLATFORM_SPEC_LIBS} rt cap pthread)
+
+# Add additional CIP Objects
+foreach(CIP_OBJECT IN LISTS OpENer_ADD_CIP_OBJECTS_LIST)
+  target_link_libraries( OpENer ${CIP_OBJECT} )
+endforeach()