diff options
| author |   fulup <fulup.arfoll@iot.bzh> | 2018-05-14 14:33:58 +0200 |
|---|---|---|
| committer | fulup <fulup.arfoll@iot.bzh> | 2018-05-14 14:34:50 +0200 |
| commit | 36f8b0e393f8407efa79f383a58e10613d18e959 (patch) | |
| tree | bc45334b6a1ca5a8fd1a74e070f3ff2631cb0f15 /conf.d | |
| parent | ba73a0f45230df1d46dc2ba37908a5e37e5e119f (diff) | |
Fix temporary app-template os detection failure
Signed-off-by: fulup <fulup.arfoll@iot.bzh>
Diffstat (limited to 'conf.d')
| -rw-r--r-- | conf.d/cmake/00-suse-osconfig.cmake | 1 | ||||
| -rw-r--r-- | conf.d/cmake/config.cmake | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/conf.d/cmake/00-suse-osconfig.cmake b/conf.d/cmake/00-suse-osconfig.cmake index 976aa1e..9f8ce3d 100644 --- a/conf.d/cmake/00-suse-osconfig.cmake +++ b/conf.d/cmake/00-suse-osconfig.cmake @@ -1,3 +1,2 @@ message(STATUS "*** Notice: OpenSuSe LUA-5.3+DynApi") list(APPEND PKG_REQUIRED_LIST lua>=5.3) -add_compile_options(-DUSE_API_DYN) diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 1b5092c..7a2cbf3 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -28,6 +28,7 @@ set(PROJECT_AUTHOR_MAIL "fulup@iot.bzh") set(PROJECT_LICENSE "APL2.0") set(PROJECT_LANGUAGES "C") + # Where are stored default templates files from submodule or subtree app-templates in your project tree # relative to the root project directory set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates") @@ -129,6 +130,7 @@ list(APPEND link_libraries afb-helpers) # CACHE STRING "Compilation flags for RELEASE build type.") set(CONTROL_SUPPORT_LUA 1) +list(APPEND PKG_REQUIRED_LIST lua>=5.3) add_definitions(-DCONTROL_PLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins:${CMAKE_BINARY_DIR}/package/lib/plugins") add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc:${CMAKE_BINARY_DIR}/package/etc") add_definitions(-DCONTROL_LUA_PATH="${CMAKE_SOURCE_DIR}/conf.d/project/lua.d:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/data") |