X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2FCMakeLists.txt;h=ada0e808cf4e8b19e8dd7913faa390b70999d601;hb=9bf2d1243b3a2a95d6bfc4b2f2fb437e87ad7168;hp=44ae9ef8f42333319b13b604348bc029292b78f9;hpb=2408a177e8260dcda266df9993e6acd528bebbbc;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/CMakeLists.txt b/low-can-binding/CMakeLists.txt
index 44ae9ef8..ada0e808 100644
--- a/low-can-binding/CMakeLists.txt
+++ b/low-can-binding/CMakeLists.txt
@@ -18,21 +18,21 @@
 ###########################################################################
 
 # Add target to project dependency list
+
 PROJECT_TARGET_ADD(low-can)
 
 	# Define project Targets
-	add_library(${TARGET_NAME} MODULE
-		binding/${TARGET_NAME}-hat.cpp
+	set (SOURCES
+		#binding/${TARGET_NAME}-hat.cpp
 		binding/${TARGET_NAME}-cb.cpp
-		binding/${TARGET_NAME}-socket.cpp
 		binding/${TARGET_NAME}-subscription.cpp
 		binding/application.cpp
-		binding/application-generated.cpp
 		can/can-bus.cpp
-		can/can-message-set.cpp
-		can/can-message-definition.cpp
-		can/can-message.cpp
-		can/can-signals.cpp
+		can/message-set.cpp
+		can/message-definition.cpp
+		can/message/message.cpp
+		can/message/can-message.cpp
+		can/signals.cpp
 		can/can-decoder.cpp
 		can/can-encoder.cpp
 		diagnostic/diagnostic-message.cpp
@@ -44,12 +44,35 @@ PROJECT_TARGET_ADD(low-can)
 		utils/socketcan.cpp
 		#utils/socketcan-raw.cpp
 		utils/socketcan-bcm.cpp
-		utils/config-parser.cpp)
+		utils/config-parser.cpp
+		utils/converter.cpp
+		binding/application-generated.cpp
+		)
+
+
+	if(WITH_FEATURE_ISOTP)
+		set(SOURCES_ISOTP
+			utils/socketcan-isotp.cpp
+		)
+	endif()
 
+
+	if(WITH_FEATURE_J1939)
+		set(SOURCES_J1939
+			can/message/j1939-message.cpp
+			utils/socketcan-j1939/socketcan-j1939.cpp
+			utils/socketcan-j1939/socketcan-j1939-data.cpp
+			utils/socketcan-j1939/socketcan-j1939-addressclaiming.cpp
+		)
+	endif()
+
+	add_library(${TARGET_NAME} MODULE ${SOURCES} ${SOURCES_J1939} ${SOURCES_ISOTP})
+
+	set(OPENAPI_DEF "binding/low-can-apidef" CACHE STRING "name and path to the JSON API definition without extension")
 	# Binder exposes a unique public entry point
 	SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
 		PREFIX "afb-"
-		LABELS "BINDING"
+		LABELS "BINDINGV3"
 		LINK_FLAGS ${BINDINGS_LINK_FLAG}
 		OUTPUT_NAME ${TARGET_NAME}
 	)
@@ -61,9 +84,6 @@ PROJECT_TARGET_ADD(low-can)
 		uds-c
 		isotp-c
 		bitfield-c
+		afb-helpers
 		${link_libraries})
 
-	# installation directory
-	INSTALL(TARGETS ${TARGET_NAME}
-		LIBRARY DESTINATION ${BINDINGS_INSTALL_DIR})
-