diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-08-18 16:43:12 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-08-18 16:45:08 +0200 |
| commit | c07477e28bcb5e4d1a2774a51aaa0877059e7f11 (patch) | |
| tree | 9c07b7b1b2ea84fc435be4614276dd67a159ddef | |
| parent | de625486c6dcfd3372a46d43988e5d5f809d2da9 (diff) | |
Remove BINDING_INSTALL_PREFIX/DIR variable
Use CMAKE_INSTALL_PREFIX by default.
Change-Id: I16f8018779b624842026ff401857e198c6436ddd
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| -rw-r--r-- | Alsa-afb/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Controller-afb/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | HAL-afb/HDA-intel/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | HAL-afb/Jabra-Solemate/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | HAL-afb/Scarlett-Focusrite/CMakeLists.txt | 2 | ||||
| m--------- | conf.d/app-templates | 0 |
6 files changed, 8 insertions, 8 deletions
diff --git a/Alsa-afb/CMakeLists.txt b/Alsa-afb/CMakeLists.txt index 876e837..38b957d 100644 --- a/Alsa-afb/CMakeLists.txt +++ b/Alsa-afb/CMakeLists.txt @@ -38,4 +38,4 @@ PROJECT_TARGET_ADD(alsa-lowlevel) # installation directory INSTALL(TARGETS ${TARGET_NAME} - LIBRARY DESTINATION ${BINDINGS_INSTALL_DIR}) + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}) diff --git a/Controller-afb/CMakeLists.txt b/Controller-afb/CMakeLists.txt index c128184..d1eb886 100644 --- a/Controller-afb/CMakeLists.txt +++ b/Controller-afb/CMakeLists.txt @@ -23,7 +23,7 @@ ADD_COMPILE_OPTIONS(-DCONTROL_CONFIG_PRE="onload") ADD_COMPILE_OPTIONS(-DCONTROL_CONFIG_POST="control") ADD_COMPILE_OPTIONS(-DCONTROL_CONFIG_PATH="${CMAKE_SOURCE_DIR}/conf.d/project/config.d:${CMAKE_INSTALL_PREFIX}/controller/config.d") ADD_COMPILE_OPTIONS(-DCTL_PLUGIN_MAGIC=2468013579) -ADD_COMPILE_OPTIONS(-DCONTROL_PLUGIN_PATH="${CMAKE_BINARY_DIR}:${CMAKE_INSTALL_PREFIX}/controller/plugin:/usr/lib/afb/controller/ctlplug") +ADD_COMPILE_OPTIONS(-DCONTROL_PLUGIN_PATH="${CMAKE_BINARY_DIR}:${CMAKE_INSTALL_PREFIX}/controller-plugins:/usr/lib/afb/controller-plugins/ctlplug") # Include LUA only when requested if(CONTROL_SUPPORT_LUA) @@ -31,7 +31,7 @@ if(CONTROL_SUPPORT_LUA) set(CTL_LUA_SOURCE ctl-lua.c) ADD_COMPILE_OPTIONS(-DCONTROL_SUPPORT_LUA) ADD_COMPILE_OPTIONS(-DCONTROL_LUA_EVENT="luaevt") - ADD_COMPILE_OPTIONS(-DCONTROL_LUA_PATH="${CMAKE_SOURCE_DIR}/conf.d/project/lua.d:${CMAKE_INSTALL_PREFIX}/controller/ctl-lua.d") + ADD_COMPILE_OPTIONS(-DCONTROL_LUA_PATH="${CMAKE_SOURCE_DIR}/conf.d/project/lua.d:${CMAKE_INSTALL_PREFIX}/controller-plugins/ctl-lua.d") else(CONTROL_SUPPORT_LUA) message(STATUS "Warning: LUA Without Support ") endif(CONTROL_SUPPORT_LUA) @@ -59,7 +59,7 @@ PROJECT_TARGET_ADD(control-afb) # installation directory INSTALL(TARGETS ${TARGET_NAME} - LIBRARY DESTINATION CMAKE_INSTALL_PREFIX ) + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX} ) PROJECT_TARGET_ADD(audio-plugin-sample) @@ -81,4 +81,4 @@ PROJECT_TARGET_ADD(audio-plugin-sample) # installation directory INSTALL(TARGETS ${TARGET_NAME} - LIBRARY DESTINATION ${BINDINGS_INSTALL_DIR}/controler) + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/controler-plugins) diff --git a/HAL-afb/HDA-intel/CMakeLists.txt b/HAL-afb/HDA-intel/CMakeLists.txt index 37e277b..aa67e0b 100644 --- a/HAL-afb/HDA-intel/CMakeLists.txt +++ b/HAL-afb/HDA-intel/CMakeLists.txt @@ -39,4 +39,4 @@ PROJECT_TARGET_ADD(hal-intel-hda) # installation directory INSTALL(TARGETS ${TARGET_NAME} - LIBRARY DESTINATION ${BINDINGS_INSTALL_DIR})
\ No newline at end of file + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}) diff --git a/HAL-afb/Jabra-Solemate/CMakeLists.txt b/HAL-afb/Jabra-Solemate/CMakeLists.txt index 973e95d..bf61dad 100644 --- a/HAL-afb/Jabra-Solemate/CMakeLists.txt +++ b/HAL-afb/Jabra-Solemate/CMakeLists.txt @@ -39,4 +39,4 @@ PROJECT_TARGET_ADD(hal-jabra-usb) # installation directory INSTALL(TARGETS ${TARGET_NAME} - LIBRARY DESTINATION ${BINDINGS_INSTALL_DIR})
\ No newline at end of file + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}) diff --git a/HAL-afb/Scarlett-Focusrite/CMakeLists.txt b/HAL-afb/Scarlett-Focusrite/CMakeLists.txt index 48d5964..1cc83e6 100644 --- a/HAL-afb/Scarlett-Focusrite/CMakeLists.txt +++ b/HAL-afb/Scarlett-Focusrite/CMakeLists.txt @@ -39,4 +39,4 @@ PROJECT_TARGET_ADD(hal-scalett-usb) # installation directory INSTALL(TARGETS ${TARGET_NAME} - LIBRARY DESTINATION ${BINDINGS_INSTALL_DIR})
\ No newline at end of file + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}) diff --git a/conf.d/app-templates b/conf.d/app-templates -Subproject aa763ddec685dc44bcb5d44718d78f3692d4f0d +Subproject 90f7727a83baa15701e3ad1a83cb12a14346b13 |