diff options
| author | <philippe colliot> | 2016-02-12 15:14:32 +0100 |
|---|---|---|
| committer | <philippe colliot> | 2016-02-12 15:14:32 +0100 |
| commit | 7213f6958bb304580d8a311f83590344f8eb8cd2 (patch) | |
| tree | eda46cfd4ec69845ba80ac1c5effe711e2582a3e /src/CMakeLists.txt | |
| parent | 172b34bbef904f006447bc9d46a6c1a7f389eae5 (diff) | |
| download | navigation-7213f6958bb304580d8a311f83590344f8eb8cd2.tar.gz | |
Alignment of Franca files
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 808135c..326b99c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -42,26 +42,28 @@ set(PATCH_DIR "${CMAKE_CURRENT_SOURCE_DIR}/patches") set(NAVIT_PNG_BIN_DIR "${CMAKE_CURRENT_BINARY_DIR}/navigation/navit/navit/navit/xpm") set(HMI_QML_DIR "${CMAKE_CURRENT_SOURCE_DIR}/hmi/qml") -if(NOT ${AMB_ON_DBUS_SESSION}) - include(ExternalProject) - ExternalProject_Add(${AUTOMOTIVE_MESSAGE_BROKER} - PREFIX ${AUTOMOTIVE_MESSAGE_BROKER_DIR} - GIT_REPOSITORY https://github.com/otcshare/automotive-message-broker.git - GIT_TAG c216955d16ca275159891cad296217094d972390 - UPDATE_COMMAND "" - PATCH_COMMAND "" - INSTALL_COMMAND sudo make install - ) -else() - include(ExternalProject) - ExternalProject_Add(${AUTOMOTIVE_MESSAGE_BROKER} - PREFIX ${AUTOMOTIVE_MESSAGE_BROKER_DIR} - GIT_REPOSITORY https://github.com/otcshare/automotive-message-broker.git - GIT_TAG c216955d16ca275159891cad296217094d972390 - UPDATE_COMMAND "" - PATCH_COMMAND patch -p1 -i "${PATCH_DIR}/amb_allow_sessionbus.patch" - INSTALL_COMMAND sudo make install - ) +if(NOT EXISTS ${AUTOMOTIVE_MESSAGE_BROKER_DIR}) + if(NOT ${AMB_ON_DBUS_SESSION}) + include(ExternalProject) + ExternalProject_Add(${AUTOMOTIVE_MESSAGE_BROKER} + PREFIX ${AUTOMOTIVE_MESSAGE_BROKER_DIR} + GIT_REPOSITORY https://github.com/otcshare/automotive-message-broker.git + GIT_TAG c216955d16ca275159891cad296217094d972390 + UPDATE_COMMAND "" + PATCH_COMMAND "" + INSTALL_COMMAND sudo make install + ) + else() + include(ExternalProject) + ExternalProject_Add(${AUTOMOTIVE_MESSAGE_BROKER} + PREFIX ${AUTOMOTIVE_MESSAGE_BROKER_DIR} + GIT_REPOSITORY https://github.com/otcshare/automotive-message-broker.git + GIT_TAG c216955d16ca275159891cad296217094d972390 + UPDATE_COMMAND "" + PATCH_COMMAND patch -p1 -i "${PATCH_DIR}/amb_allow_sessionbus.patch" + INSTALL_COMMAND sudo make install + ) + endif() endif() add_subdirectory(navigation/src/navigation "${CMAKE_CURRENT_BINARY_DIR}/navigation") |