From 6b5723d18a3c4d4f583e6edab38fe7731cda13bf Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Sat, 29 Apr 2017 18:13:28 +0200 Subject: [PATCH 1/1] Adapt CMake files to use new capabilities with widget Change-Id: I88a1ef090b7ce40c833c5780f5a481876ff7ea09 Signed-off-by: Romain Forlot --- CAN-binder/etc/config.cmake | 15 +++++++++++---- CAN-binder/libs/CMakeLists.txt | 2 +- CAN-binder/low-can-binding/CMakeLists.txt | 10 +++++----- CAN-binder/packaging/wgt/config.xml.in | 11 +++++++++++ CAN-binder/packaging/wgt/icon.png.in | Bin 0 -> 4035 bytes CAN-binder/packaging/wgt/package.in | 4 ++++ 6 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 CAN-binder/packaging/wgt/config.xml.in create mode 100644 CAN-binder/packaging/wgt/icon.png.in create mode 100644 CAN-binder/packaging/wgt/package.in diff --git a/CAN-binder/etc/config.cmake b/CAN-binder/etc/config.cmake index 7bbcc628..ac06926a 100644 --- a/CAN-binder/etc/config.cmake +++ b/CAN-binder/etc/config.cmake @@ -29,6 +29,11 @@ set(PROJECT_ICON "icon.png") # ---------------------------------- setc(CMAKE_BUILD_TYPE "DEBUG") +# Compiler selection if needed. Overload the detected compiler. +# ----------------------------------------------- +#set(CMAKE_C_COMPILER "gcc") +#set(CMAKE_CXX_COMPILER "g++") + # PKG_CONFIG required packages # ----------------------------- set (PKG_REQUIRED_LIST @@ -47,8 +52,9 @@ set(CMAKE_C_FLAGS "") set(CMAKE_CXX_FLAGS "-std=c++11") # Print a helper message when every thing is finished -setc(CLOSING_MESSAGE "Test with: afb-daemon --rootdir=\$\$(pwd)/low-can-binding/package --ldpaths=\$\$(pwd)/low-can-binding/package/lib --port=1234 --roothttp=\$\$(pwd)/low-can-binding/package/htdocs --tracereq=common --token=\"\" --verbose") # ---------------------------------------------------- +setc(CLOSING_MESSAGE "Test with: afb-daemon --rootdir=\$\$(pwd)/low-can-binding/package --ldpaths=\$\$(pwd)/low-can-binding/package/lib --port=1234 --roothttp=\$\$(pwd)/low-can-binding/package/htdocs --tracereq=common --token=\"\" --verbose") + # (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable] # --------------------------------------------------------------------- @@ -58,11 +64,11 @@ setc(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib) # Optional dependencies order # --------------------------- -set(EXTRA_DEPENDENCIES_ORDER can-config-generator low-can-binding) +#set(EXTRA_DEPENDENCIES_ORDER) # Optional Extra global include path # ----------------------------------- -#set(EXTRA_INCLUDE_DIRS can-config-generator/3rdparty/json libs/openxc-message-format/gen/cpp libs/nanopb libs/uds-c/src libs/isotp-c/src libs/bitfield-c/src) +set(EXTRA_INCLUDE_DIRS libs/openxc-message-format/gen/cpp libs/nanopb libs/uds-c/src libs/isotp-c/src libs/bitfield-c/src libs/ini-config) # Optional extra libraries # ------------------------- @@ -70,7 +76,8 @@ set(EXTRA_DEPENDENCIES_ORDER can-config-generator low-can-binding) # Optional force binding installation # ------------------------------------ -# set(BINDINGS_INSTALL_PREFIX DestinationPath ) +set(BINDINGS_INSTALL_PREFIX /opt ) +# set(WIDGET_PREFIX DestinationPath) # Optional force binding Linking flag # ------------------------------------ diff --git a/CAN-binder/libs/CMakeLists.txt b/CAN-binder/libs/CMakeLists.txt index cd29ea83..38ccd2d1 100644 --- a/CAN-binder/libs/CMakeLists.txt +++ b/CAN-binder/libs/CMakeLists.txt @@ -26,4 +26,4 @@ foreach(filename ${filelist}) PROJECT_TARGET_ADD(${shortname}) add_library(${shortname} STATIC ${sources_files}) endif(IS_DIRECTORY ${filename}) -endforeach() \ No newline at end of file +endforeach() diff --git a/CAN-binder/low-can-binding/CMakeLists.txt b/CAN-binder/low-can-binding/CMakeLists.txt index a68ea2a2..ddac1db6 100644 --- a/CAN-binder/low-can-binding/CMakeLists.txt +++ b/CAN-binder/low-can-binding/CMakeLists.txt @@ -29,8 +29,9 @@ PROJECT_TARGET_ADD(low-can-binding) # Binder exposes a unique public entry point SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES PREFIX "" + LABELS "BINDING" LINK_FLAGS ${BINDINGS_LINK_FLAG} - OUTPUT_NAME ${TARGET_NAME} + OUTPUT_NAME ${TARGET_NAME} ) # Library dependencies (include updates automatically) @@ -41,11 +42,10 @@ PROJECT_TARGET_ADD(low-can-binding) uds-c isotp-c bitfield-c - ${link_libraries} - ) + ${link_libraries}) + + populate_widget() # installation directory INSTALL(TARGETS ${TARGET_NAME} LIBRARY DESTINATION ${BINDINGS_INSTALL_DIR}) - - build_widget("BINDING") \ No newline at end of file diff --git a/CAN-binder/packaging/wgt/config.xml.in b/CAN-binder/packaging/wgt/config.xml.in new file mode 100644 index 00000000..5965904d --- /dev/null +++ b/CAN-binder/packaging/wgt/config.xml.in @@ -0,0 +1,11 @@ + + + @PROJECT_NAME@ + + + This is a demo application used with low-can binding. + Romain Forlot <romain.forlot@iot.bzh> + APL 2.0 + + + diff --git a/CAN-binder/packaging/wgt/icon.png.in b/CAN-binder/packaging/wgt/icon.png.in new file mode 100644 index 0000000000000000000000000000000000000000..9bd6a6e44f14c6dfeb5b25fe4e19555c5620bd12 GIT binary patch literal 4035 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