aboutsummaryrefslogtreecommitdiffstats
path: root/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch')
-rw-r--r--meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch64
1 files changed, 30 insertions, 34 deletions
diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch b/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch
index 3f2c2ef..b44ad1c 100644
--- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch
+++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch
@@ -9,52 +9,48 @@ Signed-off-by: Clement Dransart <clement.dransart@awtce.be>
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d4e3cb5..0004b07 100755
+index b977b76..d5fbc4a 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -169,13 +169,13 @@ if(USE_BUILD_LIBS)
- endif(NOT DEFINED CONTROLLER_PLUGIN)
- else(USE_BUILD_LIBS)
- if(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR)
-- set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/command")
-+ set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_LIBDIR}/command")
- endif(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR)
- if(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR)
-- set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/routing")
-+ set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_LIBDIR}/routing")
- endif(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR)
- if(NOT DEFINED CONTROLLER_PLUGIN)
-- set(CONTROLLER_PLUGIN "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/control/libPluginControlInterface.so")
-+ set(CONTROLLER_PLUGIN "${CMAKE_INSTALL_LIBDIR}/control/libPluginControlInterface.so")
- endif(NOT DEFINED CONTROLLER_PLUGIN)
- endif(USE_BUILD_LIBS)
+@@ -116,11 +116,11 @@ GET_ROUTING_INTERFACE_VERSION(${AUDIO_INCLUDE_FOLDER})
+ GET_CONTROL_INTERFACE_VERSION(${AUDIO_INCLUDE_FOLDER})
-@@ -228,7 +228,7 @@ set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O2 -DNDEBUG")
+ if(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR)
+- set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/command")
++ set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_LIBDIR}/command")
+ endif(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR)
+ if(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR)
+- set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/routing")
++ set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_LIBDIR}/routing")
+ endif(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR)
+ if(NOT DEFINED CONTROLLER_PLUGIN_DIR)
+- set(CONTROLLER_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/control")
++ set(CONTROLLER_PLUGIN_DIR "${CMAKE_INSTALL_LIBDIR}/control")
+ endif(NOT DEFINED CONTROLLER_PLUGIN_DIR)
+
+ ##global build flags set(CPACK_RPM_COMPONENT_INSTALL ON)
+@@ -149,7 +149,7 @@ endif(WITH_TESTS)
configure_package_config_file (
- ${CMAKE_SOURCE_DIR}/cmake/audiomanagerConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/audiomanagerConfig.cmake
+ ${CMAKE_SOURCE_DIR}/cmake/AudioManagerConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/AudioManagerConfig.cmake
- INSTALL_DESTINATION lib/${LIB_INSTALL_SUFFIX}/cmake
+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake
PATH_VARS AUDIO_INCLUDE_FOLDER )
write_basic_package_version_file(
-@@ -237,14 +237,14 @@ write_basic_package_version_file(
- COMPATIBILITY SameMajorVersion )
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/audiomanagerConfig.cmake
-- DESTINATION lib/${LIB_INSTALL_SUFFIX}/cmake
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake
- COMPONENT dev)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/config.h
+@@ -169,5 +169,5 @@ add_subdirectory (AudioManagerDaemon)
+ install(
+ FILES ${CMAKE_BINARY_DIR}/AudioManagerConfig.cmake
+ ${CMAKE_BINARY_DIR}/AudioManagerConfigVersion.cmake
+- DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake/AudioManager-${DAEMONVERSION}
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/AudioManager-${DAEMONVERSION}
+ )
+
+-install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION lib/pkgconfig COMPONENT devel)
++install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT devel)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/audiomanagerconfig.h
DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${LIB_INSTALL_SUFFIX}
COMPONENT dev)
-
- configure_file( ${CMAKE_SOURCE_DIR}/cmake/audiomanager.pc.in ${CMAKE_BINARY_DIR}/audiomanager.pc @ONLY )
--install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION lib/pkgconfig COMPONENT devel)
-+install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT devel)
-
- add_subdirectory (AudioManagerDaemon)
-
--
1.9.1