diff options
Diffstat (limited to 'conf.d')
| m--------- | conf.d/app-templates | 0 | ||||
| -rw-r--r-- | conf.d/cmake/00-debian-osconfig.cmake | 1 | ||||
| -rw-r--r-- | conf.d/cmake/config.cmake | 11 |
3 files changed, 3 insertions, 9 deletions
diff --git a/conf.d/app-templates b/conf.d/app-templates -Subproject aa68dbd12c60f9eb0015a508a22d8650914f8e5 +Subproject f94e45e8a48e16e3001cb55c4f8c3c0a2a2c9e2 diff --git a/conf.d/cmake/00-debian-osconfig.cmake b/conf.d/cmake/00-debian-osconfig.cmake deleted file mode 100644 index 2ce0ad3..0000000 --- a/conf.d/cmake/00-debian-osconfig.cmake +++ /dev/null @@ -1 +0,0 @@ -list(APPEND PKG_REQUIRED_LIST lua-5.3>=5.3) diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index cd1dee1..446534c 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -19,7 +19,6 @@ # Project Info # ------------------ set(PROJECT_NAME signal-composer) -set(PROJECT_VERSION "5.0") set(PROJECT_PRETTY_NAME "Signal composer") set(PROJECT_DESCRIPTION "Signal composer API connected to low level AGL services") set(PROJECT_URL "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/agl-service-signal-composer") @@ -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 @@ -79,7 +78,7 @@ set (PKG_REQUIRED_LIST # Prefix path where will be installed the files # Default: /usr/local (need root permission to write in) # ------------------------------------------------------ -set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt) +set(INSTALL_PREFIX $ENV{HOME}/opt) # Customize link option # ----------------------------- @@ -132,11 +131,7 @@ set(CONTROL_SUPPORT_LUA 1) add_definitions(-DCONTROL_PLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins:${CMAKE_BINARY_DIR}/package/lib/plugins:${CMAKE_BINARY_DIR}/package/var") add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc:${CMAKE_BINARY_DIR}/package/etc") add_definitions(-DCTL_PLUGIN_MAGIC=1286576532) - -# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable] -# --------------------------------------------------------------------- -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) +add_definitions(-DAFB_BINDING_VERSION=2) # Optional location for config.xml.in # ----------------------------------- |