summaryrefslogtreecommitdiffstats
path: root/CAN-binder/etc
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-04-29 18:13:28 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-04-29 18:13:28 +0200
commit6b5723d18a3c4d4f583e6edab38fe7731cda13bf (patch)
treee150b7e5a07a996f05af0f7c3a15b490d7d2146d /CAN-binder/etc
parentd5a9a1906e1487d1af3526d23b7415e81c989caf (diff)
Adapt CMake files to use new capabilities with widget
Change-Id: I88a1ef090b7ce40c833c5780f5a481876ff7ea09 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'CAN-binder/etc')
-rw-r--r--CAN-binder/etc/config.cmake15
1 files changed, 11 insertions, 4 deletions
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
# ------------------------------------