diff options
| m--------- | app-controller | 0 | ||||
| -rw-r--r-- | conf.d/cmake/config.cmake | 5 | ||||
| -rw-r--r-- | nbproject/configurations.xml | 30 |
3 files changed, 21 insertions, 14 deletions
diff --git a/app-controller b/app-controller -Subproject ce075383309a30bb7084309014c7f1c2f699bf0 +Subproject 309003b66de9c62c36a8063925e017a8a0b2cdf diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index aa32646..7af188c 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -18,7 +18,8 @@ # Project Info # ------------------ -set(PROJECT_NAME 4a-hal-unicens) +# Installation folder is in 4a-hal ! +set(PROJECT_NAME 4a-hal) set(PROJECT_PRETTY_NAME "4A-HAL-UNICENS") set(PROJECT_DESCRIPTION "Hardware Abastraction Layer for UNICENS/MLD") set(PROJECT_VERSION "0.9") @@ -132,7 +133,7 @@ set(CONTROL_SUPPORT_LUA 1 CACHE BOOL "Active or not LUA Support") add_definitions(-DCTL_PLUGIN_MAGIC=7053042648) add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_SOURCE_DIR}/conf.d/project/etc:${CMAKE_BINARY_DIR}/package/etc:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc") add_definitions(-DCONTROL_PLUGIN_PATH="${CMAKE_BINARY_DIR}/package/lib/plugins:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins") -#add_definitions(-DCONTROL_LUA_PATH="${CMAKE_SOURCE_DIR}/conf.d/project/lua.d:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/var") +add_definitions(-DCONTROL_LUA_PATH="${CMAKE_SOURCE_DIR}/conf.d/project/lua.d:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/var") add_definitions(-DAFB_BINDING_VERSION=3 -DAFB_BINDING_WANT_DYNAPI=1) # (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable] diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index c5ab4c7..5578966 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -92,8 +92,9 @@ <preprocessorList> <Elem>AFB_BINDING_VERSION=3</Elem> <Elem>AFB_BINDING_WANT_DYNAPI=1</Elem> - <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal-unicens/etc"</Elem> - <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal-unicens/lib/plugins"</Elem> + <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal/etc"</Elem> + <Elem>CONTROL_LUA_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/lua.d:/usr/local/4a-hal/var"</Elem> + <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal/lib/plugins"</Elem> <Elem>CTL_PLUGIN_MAGIC=7053042648</Elem> <Elem>NDEBUG</Elem> <Elem>SUSE_LUA_INCDIR</Elem> @@ -116,8 +117,9 @@ <preprocessorList> <Elem>AFB_BINDING_VERSION=3</Elem> <Elem>AFB_BINDING_WANT_DYNAPI=1</Elem> - <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal-unicens/etc"</Elem> - <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal-unicens/lib/plugins"</Elem> + <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal/etc"</Elem> + <Elem>CONTROL_LUA_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/lua.d:/usr/local/4a-hal/var"</Elem> + <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal/lib/plugins"</Elem> <Elem>CTL_PLUGIN_MAGIC=7053042648</Elem> <Elem>NDEBUG</Elem> <Elem>SUSE_LUA_INCDIR</Elem> @@ -147,8 +149,9 @@ <preprocessorList> <Elem>AFB_BINDING_VERSION=3</Elem> <Elem>AFB_BINDING_WANT_DYNAPI=1</Elem> - <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal-unicens/etc"</Elem> - <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal-unicens/lib/plugins"</Elem> + <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal/etc"</Elem> + <Elem>CONTROL_LUA_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/lua.d:/usr/local/4a-hal/var"</Elem> + <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal/lib/plugins"</Elem> <Elem>CTL_PLUGIN_MAGIC=7053042648</Elem> <Elem>NDEBUG</Elem> <Elem>SUSE_LUA_INCDIR</Elem> @@ -226,8 +229,9 @@ <preprocessorList> <Elem>AFB_BINDING_VERSION=3</Elem> <Elem>AFB_BINDING_WANT_DYNAPI=1</Elem> - <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal-unicens/etc"</Elem> - <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal-unicens/lib/plugins"</Elem> + <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal/etc"</Elem> + <Elem>CONTROL_LUA_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/lua.d:/usr/local/4a-hal/var"</Elem> + <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal/lib/plugins"</Elem> <Elem>CONTROL_SUPPORT_LUA</Elem> <Elem>CTL_PLUGIN_MAGIC=7053042648</Elem> <Elem>NDEBUG</Elem> @@ -253,8 +257,9 @@ <preprocessorList> <Elem>AFB_BINDING_VERSION=3</Elem> <Elem>AFB_BINDING_WANT_DYNAPI=1</Elem> - <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal-unicens/etc"</Elem> - <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal-unicens/lib/plugins"</Elem> + <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal/etc"</Elem> + <Elem>CONTROL_LUA_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/lua.d:/usr/local/4a-hal/var"</Elem> + <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal/lib/plugins"</Elem> <Elem>CTL_PLUGIN_MAGIC=7053042648</Elem> <Elem>NDEBUG</Elem> <Elem>SUSE_LUA_INCDIR</Elem> @@ -276,8 +281,9 @@ <preprocessorList> <Elem>AFB_BINDING_VERSION=3</Elem> <Elem>AFB_BINDING_WANT_DYNAPI=1</Elem> - <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal-unicens/etc"</Elem> - <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal-unicens/lib/plugins"</Elem> + <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal/etc"</Elem> + <Elem>CONTROL_LUA_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/lua.d:/usr/local/4a-hal/var"</Elem> + <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal/lib/plugins"</Elem> <Elem>CTL_PLUGIN_MAGIC=7053042648</Elem> <Elem>NDEBUG</Elem> <Elem>SUSE_LUA_INCDIR</Elem> |