diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-03-06 22:39:31 +0100 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-03-16 17:05:17 +0100 |
| commit | a1a0b7b176f6c34c0e644335ff70be3f7421494b (patch) | |
| tree | 7735cf4de3d4ed8b9df757064c73860fa052fdee /src/CMakeLists.txt | |
| parent | de8fb10e1d8e98a85dfba6fc8966266dbf5e42c6 (diff) | |
Finalize new directories organization.
Change include statements and CMakeLists.txt accordingly
to the new layout.
Change-Id: Ief0821f7f6636b072cf26c7d8d8fcc16fe43ab01
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 89e33611..8acdd1d7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -69,7 +69,7 @@ add_compile_options(${EXTRAS_CXXFLAGS}) add_definitions(-DPB_FIELD_16BIT) # Needed extra directories to hit the required headers files. -include_directories(${EXTRAS_INCLUDE_DIRS} ${PROJECT_LIBDIR}/openxc-message-format/gen/cpp ${PROJECT_LIBDIR}/nanopb/ ${PROJECT_LIBDIR}/uds-c/src ${PROJECT_LIBDIR}/bitfield-c/src ${PROJECT_LIBDIR}/isotp-c/src) +include_directories(${EXTRAS_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR} ${PROJECT_LIBDIR}/openxc-message-format/gen/cpp ${PROJECT_LIBDIR}/nanopb/ ${PROJECT_LIBDIR}/uds-c/src ${PROJECT_LIBDIR}/bitfield-c/src ${PROJECT_LIBDIR}/isotp-c/src) ########################################################################### # the library used by the binding : openxc, bitfield, uds, isotp @@ -83,7 +83,10 @@ add_library(openxc STATIC ${PROJECT_LIBDIR}/openxc-message-format/gen/cpp/openxc message(STATUS "Creation of ${PROJECT_NAME} binding for AFB-DAEMON") ########################################################################### -add_library(${PROJECT_NAME} MODULE ${PROJECT_NAME}.cpp can-bus.cpp can-message.cpp can-signals.cpp can-decoder.cpp obd2-signals.cpp signals.cpp openxc-utils.cpp timer.cpp) +add_library(${PROJECT_NAME} MODULE ${PROJECT_NAME}.cpp + can/can-bus.cpp can/can-message.cpp can/can-signals.cpp can/can-decoder.cpp + obd2/obd2-signals.cpp + utils/signals.cpp utils/openxc-utils.cpp utils/timer.cpp) target_link_libraries(${PROJECT_NAME} ${EXTRAS_LIBRARIES} bitfield isotp uds openxc pthread) set_target_properties(${PROJECT_NAME} PROPERTIES |