diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2018-07-06 16:21:38 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2018-07-10 17:12:30 +0200 |
| commit | 5e16e21700ec6478136a891943753fff0202ee90 (patch) | |
| tree | de39efa49a08f8f70362e21dfc70cc3ec01f41cd | |
| parent | cd5d24ef08c067f6a609060d31bd35edb6a57949 (diff) | |
Make Built type overwritten by cli possible.
Settings a CMAKE CACHE variable make the first definition
to be not overwritten by a next assignement. Then a cli
variable is then possible more without force.
Change installation prefix to point the same than afb-daemon.
Change-Id: Ia3cb60e9ea16897bbeee117d8b8170e4ed793edd
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| -rw-r--r-- | conf.d/cmake/config.cmake | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index f3850df..889ee9a 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -45,7 +45,7 @@ set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates") # Compilation Mode (DEBUG, RELEASE) # ---------------------------------- -set(CMAKE_BUILD_TYPE "DEBUG") +set(CMAKE_BUILD_TYPE "DEBUG" CACHE STRING "Default build type chosen. (Overwritten by cli if given)") # Kernel selection if needed. You can choose between a # mandatory version to impose a minimal version. @@ -76,13 +76,7 @@ set (PKG_REQUIRED_LIST # Prefix path where will be installed the files # Default: /usr/local (need root permission to write in) # ------------------------------------------------------ -execute_process( - COMMAND pkg-config --variable binding_install_dir afb-daemon - OUTPUT_VARIABLE afb_binding_install_dir - OUTPUT_STRIP_TRAILING_WHITESPACE -) - -set(CMAKE_INSTALL_PREFIX ${afb_binding_install_dir}) +set(CMAKE_INSTALL_PREFIX /opt/AGL) # Customize link option # ----------------------------- |