summaryrefslogtreecommitdiffstats
path: root/conf.d/cmake
diff options
context:
space:
mode:
authorThierry Bultel <thierry.bultel@iot.bzh>2018-06-29 15:50:13 +0200
committerThierry Bultel <thierry.bultel@iot.bzh>2018-07-17 10:50:07 +0200
commitd564d41b640f3ed69e16cc0e2eaf258778191b04 (patch)
tree16118058f8afa3222d1b156b02225c3bd9e52c7d /conf.d/cmake
parent9f5ed322b54f12c1055d2a124d687965083d4dee (diff)
Use latest version of conf.d/app-templates submodule.
Changes of conf.d/app-templates: (6fb3846 - Romain Forlot) Warning if not using wgtpkg-pack to make a widget (35f3af1 - Sebastien Douheret) Rework CMAKE_INSTALL_PREFIX and INSTALL_PREFIX var (332f377 - Romain Forlot) Be able to overwrite BUILD_TYPE using CLI (1ec7531 - Romain Forlot) Use CACHE variable for other common CMAKE variable (0880356 - Romain Forlot) Fix:: wrong wgt using RELEASE BUILD TYPE (eec9f07 - Romain Forlot) Fix: SYSROOT location detection... Wrong test. (291aa4e - Romain Forlot) Change the default debug compilation options. (22a2cbf - Romain Forlot) Clearer coverage compilation options configuration (aa68dbd - Romain Forlot) Don't overwrite the autobuild script if it exists (a13e7b9 - Romain Forlot) Disable the in-tree build method. (51026d2 - Romain Forlot) Detect Yocto as OS distribution (1f2944e - Romain Forlot) Fix: wrong compile options added (92646f6 - Romain Forlot) Fallback using zip format if no wgtpkg-pack found (f65761c - José Bollo) 02-variables.cmake: Avoid checking CXX version if not required (3965d37 - José Bollo) config.cmake.sample: Remove dependency to libsystemd (a45ae0c - José Bollo) config.cmake.sample: Remove dependency to libmicrohttpd (9b17efe - Thierry Bultel) Added -D_FORTIFY_SOURCE=2 to CFLAGS (66f7bc8 - Thierry Bultel) start-on-target: uses RSYNC_PREFIX path for config (e400fb3 - Sebastien Douheret) Fixed spelling. (6621af0 - Romain Forlot) Improve OS detection (829dd69 - Romain Forlot) Fix: OS detection (8f5a17b - Romain Forlot) Launch from workdir (72ca4ff - Romain Forlot) Change closing that could fix native debugging (6e1a3c3 - Romain Forlot) Fix filename pattern to match .cmake files (30e78a5 - Romain Forlot) Adding cmake file at the root directory (a3c312e - Romain Forlot) Adds commit hash to the version. (6c0e9e4 - Romain Forlot) Change default sample settings. (dd0cec7 - Romain Forlot) Forgot updating README also... (66d0ca1 - Romain Forlot) Update documentation (4b26503 - Romain Forlot) Use LFSH named, rename data to var (bb3c541 - Romain Forlot) Use new CPP generation from afb-genskel (ee5d60f - Romain Forlot) Update README with latest docs modifications (f3954e8 - Romain Forlot) Doesn't set rpath for built target and update doc (935c390 - Romain Forlot) Details external library. (dc4debf - Romain Forlot) Deprecate PROJECT_LIBDIR and PROJECT_RESOURCES var (c9fdbc1 - Romain Forlot) Make sure to point to correct dir for cmake script (818a2bc - Romain Forlot) Fix variables checking. (e40a854 - Romain Forlot) CMake doesn't path protection. (0487d44 - Romain Forlot) Compare to manual Project version if not from git (7dabdeb - Romain Forlot) No failure if none tags found on project git repo (52a3998 - Romain Forlot) Protect path with space in it. (1687531 - Romain Forlot) Check version between app-templates and project. (d275993 - Romain Forlot) Cleaning (054d3b8 - Romain Forlot) Could specify others default install directories (8c2b059 - Scott Murray) Fix finding config template (c881d86 - Romain Forlot) Disallow build in-source. (17456de - Romain Forlot) Keep libraries and binding in the same directory (8a77e99 - Romain Forlot) Update README and documentation (0fb7a38 - Romain Forlot) Include ExternalProject CMake module by default (6485d21 - Romain Forlot) Cleaning (cc6d75e - Romain Forlot) Handle imported target to populate package folder (637b244 - Romain Forlot) Control install destination directory (cd06605 - Romain Forlot) Fix: wrong if closure... (e846150 - Romain Forlot) Make use of LibEfence optional (6393acf - Romain Forlot) Update Readme (3465ddb - Romain Forlot) Fix: No build error on input files checked (9116b93 - Romain Forlot) Adding install target to autobuild script (908a037 - Romain Forlot) Handle controller plugin populate and install (784e0e5 - Romain Forlot) Clearer output when checking data file (5df967a - Romain Forlot) Don't fails if data files checker not found. (b05e442 - Romain Forlot) Update doc (e9a682f - Romain Forlot) Copying content not the directory. (11478fa - Romain Forlot) Disabling packaging target. To be externalized (37d062d - Romain Forlot) Added populate binding config files (b5fb436 - Romain Forlot) Fix: wrong OS detection when SDK env or Yocto (42e5f14 - Stephane Desneux) templates.d: adjustments for xds (gdb*.ini, xds-project-target.conf) (b1c4a8f - Stephane Desneux) start-on-target.sh.in: use --monitoring option to start afb-daemon (4488c5e - Romain Forlot) Dirty fix to handle distro specific packages deps (7995a00 - Ronan Le Martret) Fix pkgconfig parsing result (6829eb3 - Ronan Le Martret) Fix deb packaging pkgconfig dependency (454f835 - Romain Forlot) Fix: output msg if build fail on remote populate (36dca05 - Romain Forlot) add_input_target targets built by default (4a4b3cc - Romain Forlot) Update doc and README with latest modifications (28dcbc3 - Romain Forlot) Generic default CLOSING_MESSAGE in sample config (73f75d5 - Romain Forlot) Indent (bd08c67 - Romain Forlot) Comment apparently uneeded section. (cf98a0c - Romain Forlot) Change luac option to do only syntax checking (5e0b34e - Romain Forlot) Fix: use of filter in Cmake 3.5 (fcc49c7 - Romain Forlot) Fix: mistaped (1223c0b - Romain Forlot) Fix: luac invokation failed. (6ca5346 - Romain Forlot) Workaround to bugged list filter backport function (13239eb - Romain Forlot) Fix: wrong variable detection (367dde6 - Romain Forlot) OS detection to fallback instead of addition (08aec90 - Romain Forlot) Enhances OS detection with Yocto and SDK (0365ed1 - Romain Forlot) Format: Remove spaces at EOL (2e8abc4 - Romain Forlot) Better OS detection. (20aab30 - Romain Forlot) Format, improve config.cmake.sample file (de03118 - Romain Forlot) Add macros to make a 2nd pass on required module (4d67d06 - Romain Forlot) Better OS detection and inclusion per distribution (3a90fb6 - Romain Forlot) Don't output compiled lua file when checked. (350c5b9 - Romain Forlot) Install automatically managed for populate targets (3e81095 - Romain Forlot) Fix: BINDINGV2 target not populated (9a73785 - Romain Forlot) Better handling icon&config.xml to build widget (90f7727 - Romain Forlot) Cleaning, format (104c349 - Romain Forlot) Duplicate variable meant to set installation dir (aa763dd - Romain Forlot) Make CMake minimal version to at least v3.5 (421f628 - Romain Forlot) Remove JSON checker not suitable for schema check (7919a68 - Romain Forlot) Added per project custom template dir (f6de0ca - Romain Forlot) Fix: missing dev pkg files error. Now well checked (9c71a76 - Romain Forlot) Personal files inclusion now by projects. (0013593 - Romain Forlot) Fix new arbo (22fee6b - Romain Forlot) Reorganization between variables/build options (735b677 - Romain Forlot) Avoid wrong OPENAPI_DEF variable definition (ff2dc94 - Romain Forlot) Better handling of icons (474a2e9 - Romain Forlot) Ease standard target DATA and HTDOCS creation (e1ef035 - Romain Forlot) Extending pluggable arch for templates (20c82ee - Romain Forlot) Update documentation about properties (35e2d30 - Romain Forlot) Be able to choose openAPI definition file name. Change-Id: I3f461b4e1caa6979988c75c62f3c78525edf8574 Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
Diffstat (limited to 'conf.d/cmake')
-rw-r--r--conf.d/cmake/config.cmake8
1 files changed, 2 insertions, 6 deletions
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 86588d4..26c37b9 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -20,7 +20,6 @@
# Project Info
# ------------------
set(PROJECT_NAME agl-service-radio)
-set(PROJECT_VERSION "1.0")
set(PROJECT_PRETTY_NAME "Radio binding service")
set(PROJECT_DESCRIPTION "Expose Radio Low Level APIs through AGL Framework")
set(PROJECT_ICON "icon.png")
@@ -45,7 +44,7 @@ set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
# Compilation Mode (DEBUG, RELEASE)
# ----------------------------------
-set(CMAKE_BUILD_TYPE "DEBUG")
+set(BUILD_TYPE "DEBUG")
# Kernel selection if needed. You can choose between a
# mandatory version to impose a minimal version.
@@ -83,11 +82,8 @@ add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-pthread>)
# -----------------------------
list (APPEND link_libraries -pthread)
-# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]
# ---------------------------------------------------------------------
-set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
-set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
-set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib)
+set(INSTALL_PREFIX $ENV{HOME}/opt)
# Optional location for config.xml.in
# -----------------------------------