X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2FCMakeLists.txt;h=63ed99cce16abfee4f2daa592941a7f7ffd6e254;hb=22e1fe8db6686ee6ae32cfe58a10aad9f7dfb3a7;hp=cd38fca302698948901d895714dfc52d4ed31587;hpb=32e25cbca210a359b09768537b6f443fe90a3070;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/CMakeLists.txt b/low-can-binding/CMakeLists.txt
index cd38fca3..63ed99cc 100644
--- a/low-can-binding/CMakeLists.txt
+++ b/low-can-binding/CMakeLists.txt
@@ -18,21 +18,23 @@
 ###########################################################################
 
 # 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}-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
 		diagnostic/diagnostic-manager.cpp
 		diagnostic/active-diagnostic-request.cpp
@@ -40,14 +42,28 @@ PROJECT_TARGET_ADD(low-can)
 		utils/openxc-utils.cpp
 		utils/timer.cpp
 		utils/socketcan.cpp
-		utils/socketcan-raw.cpp
+		#utils/socketcan-raw.cpp
 		utils/socketcan-bcm.cpp
-		utils/config-parser.cpp)
+		utils/config-parser.cpp
+		binding/application-generated.cpp
+		)
 
+	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})
+
+	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}
 	)
@@ -59,9 +75,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})
-