update

Author: jwinarske

CMakeLists.txt

@@ -100,8 +100,6 @@ target_link_libraries(headunit PUBLIC
 )
 
 if(BUILD_MAZDA)
-    add_dependencies(headunit dbus-cplusplus)
-
     target_compile_options(headunit PUBLIC -static-libstdc++ -DCMU=1)
 
     target_include_directories(headunit PUBLIC

cmake/deps.cmake

@@ -54,37 +54,17 @@ if(GIT_EXECUTABLE)
 endif()
 
 if(BUILD_MAZDA)
+    set(GEN_DBUS_HEADER_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/mazda/dbus/dbusxx-xml2cpp)
+    add_custom_command(TARGET dbus-cplusplus POST_BUILD
+            COMMAND ${GEN_DBUS_HEADER_COMMAND} cmu_interfaces.xml --proxy=generated_cmu.h
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mazda/dbus
+            COMMENT "Generating generated_cmu.h")
 
-    find_package(DBus REQUIRED)
-
-    set(THIRD_PARTY_DIR ${CMAKE_SOURCE_DIR}/third_party)
-
-    include(ExternalProject)
-    ExternalProject_Add(dbus-cplusplus
-        GIT_REPOSITORY https://github.com/GENIVI/dbus-cplusplus.git
-        GIT_TAG master
-        GIT_SHALLOW true
-        PATCH_COMMAND
-            cd ${THIRD_PARTY_DIR}/dbus-cplusplus &&
-            git checkout . &&
-            git apply ${CMAKE_CURRENT_SOURCE_DIR}/cmake/dbus.patch
-        SOURCE_DIR ${THIRD_PARTY_DIR}/dbus-cplusplus
-        BUILD_IN_SOURCE 0
-        WORKING_DIRECTORY ${THIRD_PARTY_DIR}/dbus-cplusplus
-        CONFIGURE_COMMAND ./autogen.sh --prefix=${CMAKE_STAGING_PREFIX} --disable--ecore --disable-tests --disable-examples
-        BUILD_COMMAND make
-        INSTALL_COMMAND make install
-    )
-
-    if(NOT CMAKE_CROSSCOMPILING)
-        set(GEN_DBUS_HEADER_COMMAND ${CMAKE_STAGING_PREFIX}/bin/dbusxx-xml2cpp)
-    else() # TODO - expect cross compile host to be x86-64
-        set(GEN_DBUS_HEADER_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/mazda/dbus/dbusxx-xml2cpp)
-    endif()
+    set(DBUS1_LIBRARY="${TRAVIS_BUILD_DIR}/mazda/m3-toolchain/arm-cortexa9_neon-linux-gnueabi/sysroot/usr/lib/libdbus-1.so.3.7.12")
 
-    add_custom_command(TARGET dbus-cplusplus POST_BUILD
-        COMMAND ${GEN_DBUS_HEADER_COMMAND} cmu_interfaces.xml --proxy=generated_cmu.h
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mazda/dbus
-        COMMENT "Generating generated_cmu.h")
+    set(OPENSSL_CRYPTO_LIBRARY="${TRAVIS_BUILD_DIR}/mazda/m3-toolchain/arm-cortexa9_neon-linux-gnueabi/sysroot/usr/lib/libcrypto.a")
+    set(OPENSSL_INCLUDE_DIR="${TRAVIS_BUILD_DIR}/mazda/m3-toolchain/arm-cortexa9_neon-linux-gnueabi/sysroot/usr/include")
 
+    set(Protobuf_LIBRARIES="${TRAVIS_BUILD_DIR}/mazda/protobuf-2.6.1-arm/lib/libprotobuf-lite.a")
+    set(Protobuf_INCLUDE_DIR="${TRAVIS_BUILD_DIR}/mazda/protobuf-2.6.1-arm/include")
 endif()