summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-04-14 12:09:47 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-04-14 12:09:47 +0200
commit044ef27d3667a114964549f89c63ab1ea6655877 (patch)
treedd7a042e7fa161de42b94bf8046383dc2e992547
parent2f47684220a5d398767ee35e0c2c949b27839197 (diff)
Cleaning CMAke
Change-Id: I4efb09946474fadcf41cf9d04ad0f462ae4d0704 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--etc/config.cmake8
-rw-r--r--libs/CMakeLists.txt22
2 files changed, 16 insertions, 14 deletions
diff --git a/etc/config.cmake b/etc/config.cmake
index 849f77d..4b910d2 100644
--- a/etc/config.cmake
+++ b/etc/config.cmake
@@ -42,8 +42,12 @@ set (PKG_REQUIRED_LIST
add_compile_options(-D_REENTRANT)
add_compile_options(-DPB_FIELD_16BIT)
+# LANG Specific compile flags set for all build types
+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 --ldpaths=\$\$(pwd)/package/lib --port=1234 --roothttp=\$\$(pwd)/package/htdocs --tracereq=common --token=\"\" --verbose")
+setc(CLOSING_MESSAGE "Test with: afb-daemon --ldpaths=\$\$(pwd)/low-can-binding/package/lib --port=1234 --roothttp=\$\$(pwd)/package/htdocs --tracereq=common --token=\"\" --verbose")
# ----------------------------------------------------
# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]
@@ -54,7 +58,7 @@ setc(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib)
# Optional dependencies order
# ---------------------------
-set(EXTRA_DEPENDENCIES_ORDER can-config-generator openxc-libs low-can-binding)
+set(EXTRA_DEPENDENCIES_ORDER can-config-generator low-can-binding)
# Optional Extra global include path
# -----------------------------------
diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
index 30948ab..cd29ea8 100644
--- a/libs/CMakeLists.txt
+++ b/libs/CMakeLists.txt
@@ -17,15 +17,13 @@
###########################################################################
# Add target to project dependency list
-
-
- fill_include_dir(${CMAKE_CURRENT_SOURCE_DIR})
- file(GLOB filelist "${CMAKE_CURRENT_SOURCE_DIR}/*")
- foreach(filename ${filelist})
- if(IS_DIRECTORY ${filename})
- STRING(REGEX REPLACE "^.*\/(.*)$" "\\1" shortname ${filename})
- find_source_files(${filename})
- PROJECT_TARGET_ADD(${shortname})
- add_library(${shortname} STATIC ${sources_files})
- endif(IS_DIRECTORY ${filename})
- endforeach() \ No newline at end of file
+fill_include_dir(${CMAKE_CURRENT_SOURCE_DIR})
+file(GLOB filelist "${CMAKE_CURRENT_SOURCE_DIR}/*")
+foreach(filename ${filelist})
+ if(IS_DIRECTORY ${filename})
+ STRING(REGEX REPLACE "^.*\/(.*)$" "\\1" shortname ${filename})
+ find_source_files(${filename})
+ PROJECT_TARGET_ADD(${shortname})
+ add_library(${shortname} STATIC ${sources_files})
+ endif(IS_DIRECTORY ${filename})
+endforeach() \ No newline at end of file