diff options
6 files changed, 46 insertions, 66 deletions
diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.0.bbappend b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.0.bbappend index ba56fef..7f57486 100644 --- a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.0.bbappend +++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.0.bbappend @@ -10,14 +10,14 @@ EXTRA_OECMAKE_append = " -DWITH_TESTS=ON -DUSE_BUILD_LIBS=OFF \ -DCMAKE_SKIP_RPATH=ON \ " +DEPENDS += "gtest gmock" + do_install_append() { mkdir -p ${D}/opt/tests/${PN} for i in `find ${B}/bin/ -type f -regex '.*[tT]est.*'`; do install -m 0755 ${i} ${D}/opt/tests/${PN} done - install -m 0755 ${B}/googleMock/gtest/libgtest_dll.so ${D}/opt/tests/${PN} - install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} } 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 deleted file mode 100644 index b44ad1c..0000000 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch +++ /dev/null @@ -1,56 +0,0 @@ -From d214197c418945f8ae8ad72a7173c6b83a808ef0 Mon Sep 17 00:00:00 2001 -From: Clement Dransart <clement.dransart@awtce.be> -Date: Fri, 17 Jun 2016 10:40:36 +0200 -Subject: [audiomanager][PATCH] audiomanager: fix lib install path for multilib - -Signed-off-by: Clement Dransart <clement.dransart@awtce.be> ---- - CMakeLists.txt | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b977b76..d5fbc4a 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -116,11 +116,11 @@ GET_ROUTING_INTERFACE_VERSION(${AUDIO_INCLUDE_FOLDER}) - GET_CONTROL_INTERFACE_VERSION(${AUDIO_INCLUDE_FOLDER}) - - 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 -- INSTALL_DESTINATION lib/${LIB_INSTALL_SUFFIX}/cmake -+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake - PATH_VARS AUDIO_INCLUDE_FOLDER ) - - write_basic_package_version_file( -@@ -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) --- -1.9.1 - diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib_7.0.patch b/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib_7.0.patch index 3f2c2ef..7417a31 100644 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib_7.0.patch +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib_7.0.patch @@ -17,15 +17,15 @@ index d4e3cb5..0004b07 100755 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") ++ set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_PREFIX}/lib/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") ++ set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_PREFIX}/lib/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") ++ set(CONTROLLER_PLUGIN "${CMAKE_INSTALL_PREFIX}/lib/control/libPluginControlInterface.so") endif(NOT DEFINED CONTROLLER_PLUGIN) endif(USE_BUILD_LIBS) diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0002-audiomanager-fix-googleMock.patch b/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0002-audiomanager-fix-googleMock.patch new file mode 100644 index 0000000..3a31f5d --- /dev/null +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0002-audiomanager-fix-googleMock.patch @@ -0,0 +1,40 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0004b07..75a2185 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -216,9 +216,14 @@ if(WITH_DLT) + endif(WITH_DLT) + + if(WITH_TESTS) +- add_subdirectory(googleMock) +- set(GMOCK_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/googleMock/include") +- set(GOOGLE_TEST_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/googleMock/gtest/include") ++ #check if we can find the google stuff ++ pkg_check_modules (GTEST "gtest >= 1.6.0") ++ pkg_check_modules (GMOCK "gmock >= 1.6.0") ++ if (NOT("${GTEST_FOUND}" AND "${GMOCK_FOUND}")) ++ add_subdirectory(googleMock) ++ set(GMOCK_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/googleMock/include") ++ set(GOOGLE_TEST_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/googleMock/gtest/include") ++ endif (NOT("${GTEST_FOUND}" AND "${GMOCK_FOUND}")) + endif(WITH_TESTS) + + ##global build flags set(CPACK_RPM_COMPONENT_INSTALL ON) +diff --git a/cmake/audiomanagerConfig.cmake.in b/cmake/audiomanagerConfig.cmake.in +index fb6fd36..b3f6942 100644 +--- a/cmake/audiomanagerConfig.cmake.in ++++ b/cmake/audiomanagerConfig.cmake.in +@@ -37,13 +37,4 @@ set(COMMONAPI_DBUS_VERSION_NUMBER "@COMMONAPI_DBUS_VERSION_NUMBER@") + set(COMMONAPI_SOMEIP_VERSION_NUMBER "@COMMONAPI_SOMEIP_VERSION_NUMBER@") + set(COMMONAPI_USED_BINDING "@COMMONAPI_USED_BINDING@") + +-IF(WITH_TESTS) +- set_and_check(GOOGLE_MOCK_PROJECT_FOLDER "@GOOGLE_MOCK_PROJECT_FOLDER@") +- set_and_check(GMOCK_INCLUDE_DIR "@GMOCK_INCLUDE_DIR@") +- set_and_check(GOOGLE_TEST_INCLUDE_DIR "@GOOGLE_TEST_INCLUDE_DIR@") +-ENDIF(WITH_TESTS) +- + check_required_components(AudioManagerDaemon) +- +- +- diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb index 60f21fb..e1d509c 100644 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb @@ -14,6 +14,7 @@ SRC_URI = " \ file://AudioManager.service \ file://setup_amgr.sh \ file://0001-audiomanager-fix-lib-install-path-for-multilib_7.0.patch \ + file://0002-audiomanager-fix-googleMock.patch \ " S = "${WORKDIR}/git" diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb index d8603af..9b9bfdc 100644 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb @@ -50,8 +50,3 @@ FILES_${PN}-dev = " \ /usr/include/ \ ${libdir}/pkgconfig/ \ " - -do_install_append() { - mv ${D}${libdir}/audiomanager/* ${D}${libdir}/ - rmdir ${D}${libdir}/audiomanager -} |