From 204a337649acba29a5a642bfa015ec12cb617e3f Mon Sep 17 00:00:00 2001 From: Christian Linke Date: Mon, 22 Feb 2016 11:15:32 +0100 Subject: fixed pc files --- .../test/AmRouterMapTest/CAmRouterMapTest.cpp | 2 +- AudioManagerDaemon/CMakeLists.txt | 2 + AudioManagerUtilities/CMakeLists.txt | 44 +++++++++++----------- CMakeLists.txt | 2 +- cmake/AudioManagerUtilitiesConfig.cmake.in | 2 + cmake/audiomanagerutilities.pc.in | 2 +- 6 files changed, 30 insertions(+), 24 deletions(-) diff --git a/AudioManagerCore/test/AmRouterMapTest/CAmRouterMapTest.cpp b/AudioManagerCore/test/AmRouterMapTest/CAmRouterMapTest.cpp index e662b4b..46b2d41 100644 --- a/AudioManagerCore/test/AmRouterMapTest/CAmRouterMapTest.cpp +++ b/AudioManagerCore/test/AmRouterMapTest/CAmRouterMapTest.cpp @@ -3175,7 +3175,7 @@ int main(int argc, char **argv) catch (TCLAP::ArgException &e) // catch any exceptions { std::cerr << "error: " << e.error() << " for arg " << e.argId() << std::endl; } CAmCommandLineSingleton::instance()->preparse(argc,argv); - CAmDltWrapper::instanctiateOnce("rTEST","RouterMap Test",enableDebug.getValue(),CAmDltWrapper::logDestination::DAEMON); + CAmDltWrapper::instanctiateOnce("rTEST","RouterMap Test",enableDebug.getValue(),CAmDltWrapper::logDestination::DAEMON); logInfo("Routing Test started "); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt index acc5c2b..5e219bc 100644 --- a/AudioManagerDaemon/CMakeLists.txt +++ b/AudioManagerDaemon/CMakeLists.txt @@ -21,6 +21,8 @@ project (AudioManagerDeamon LANGUAGES CXX VERSION ${DAEMONVERSION}) set(AUDIOMAN_SRCS_CXX src/main.cpp) + +message (STATUS "daemon ${AUDIOMANAGER_UTILITIES_INCLUDE}" ) INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} diff --git a/AudioManagerUtilities/CMakeLists.txt b/AudioManagerUtilities/CMakeLists.txt index f859026..55c97a6 100644 --- a/AudioManagerUtilities/CMakeLists.txt +++ b/AudioManagerUtilities/CMakeLists.txt @@ -21,12 +21,7 @@ PROJECT(AudioManagerUtilities LANGUAGES CXX VERSION ${DAEMONVERSION}) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") -SET(AUDIOMANAGER_UTILITIES_INCLUDE - ${AUDIOMANAGER_UTILITIES}/include - ${AUDIO_INCLUDE_FOLDER} - ${TCLAP_INCLUDE_DIR} - ${AUDIOMANAGER_INCLUDE_FOLDER} - CACHE INTERNAL "AUDIOMANAGER_INCLUDE directories" FORCE) +SET(AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE "") SET(AUDIO_MANAGER_UTILITIES_LIBS ${CMAKE_DL_LIBS} @@ -51,8 +46,8 @@ if(WITH_SYSTEMD_WATCHDOG) ${AUDIO_MANAGER_UTILITIES_LIBS} ${SYSTEMD_LIBRARIES} CACHE INTERNAL "AUDIO_MANAGER_UTILITIES_LIBS libs" FORCE) - set(AUDIOMANAGER_UTILITIES_INCLUDE - ${AUDIOMANAGER_UTILITIES_INCLUDE} + set(AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE + ${AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE} ${SYSTEMD_INCLUDEDIR}) set (AUDIO_MANAGER_UTILITIES_SRCS_CXX ${AUDIO_MANAGER_UTILITIES_SRCS_CXX} @@ -63,10 +58,9 @@ endif(WITH_SYSTEMD_WATCHDOG) IF (WITH_DBUS_WRAPPER) pkg_check_modules (DBUS REQUIRED "dbus-1 >= 1.4") - set(AUDIOMANAGER_UTILITIES_INCLUDE - ${AUDIOMANAGER_UTILITIES_INCLUDE} - ${DBUS_INCLUDE_DIRS} - CACHE INTERNAL "AUDIOMANAGER_INCLUDE directories" FORCE) + set(AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE + ${AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE} + ${DBUS_INCLUDE_DIRS}) set (AUDIO_MANAGER_UTILITIES_LIBS ${AUDIO_MANAGER_UTILITIES_LIBS} @@ -91,14 +85,13 @@ IF (WITH_CAPI_WRAPPER) ${AUDIO_MANAGER_UTILITIES_SRCS_CXX} src/CAmCommonAPIWrapper.cpp) - set(AUDIOMANAGER_UTILITIES_INCLUDE - ${AUDIOMANAGER_UTILITIES_INCLUDE} - ${COMMONAPI_INCLUDE_DIRS} - CACHE INTERNAL "AUDIOMANAGER_INCLUDE directories" FORCE) + set(AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE + ${AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE} + ${COMMONAPI_INCLUDE_DIRS}) ENDIF (WITH_CAPI_WRAPPER) if(WITH_DLT) - pkg_check_modules(DLT REQUIRED "automotive-dlt >= 2.2.0") + pkg_check_modules(DLT REQUIRED "automotive-dlt >= 2.2.0") add_definitions(${DLT_CFLAGS_OTHER}) @@ -107,12 +100,21 @@ if(WITH_DLT) ${DLT_LIBRARIES} CACHE INTERNAL "AUDIO_MANAGER_UTILITIES_LIBS libs" FORCE) - SET(AUDIOMANAGER_UTILITIES_INCLUDE - ${AUDIOMANAGER_UTILITIES_INCLUDE} - ${DLT_LIBRARY_DIRS} - CACHE INTERNAL "AUDIOMANAGER_INCLUDE directories" FORCE) + SET(AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE + ${AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE} + ${DLT_LIBRARY_DIRS}) endif(WITH_DLT) +SET(AUDIOMANAGER_UTILITIES_INCLUDE + ${AUDIOMANAGER_UTILITIES}/include + ${AUDIO_INCLUDE_FOLDER} + ${TCLAP_INCLUDE_DIR} + ${AUDIOMANAGER_INCLUDE_FOLDER} + ${AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE} + CACHE INTERNAL "AUDIOMANAGER_INCLUDE directories" FORCE) + + +message (STATUS "bla ${AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE}") INCLUDE_DIRECTORIES(${AUDIOMANAGER_UTILITIES_INCLUDE}) diff --git a/CMakeLists.txt b/CMakeLists.txt index b977b76..0a631df 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ option( WITH_TELNET "Build with Telnetserver (can only work with SocketHandler)" ON) option ( WITH_SYSTEMD_WATCHDOG - "Build with systemD support & watchdog" OFF) + "Build with systemD support & watchdog" ON) option ( GLIB_DBUS_TYPES_TOLERANT "Build dbus with tolerance towards glib 16bit/32bit handling" ON) diff --git a/cmake/AudioManagerUtilitiesConfig.cmake.in b/cmake/AudioManagerUtilitiesConfig.cmake.in index 5148f34..37a1fbd 100644 --- a/cmake/AudioManagerUtilitiesConfig.cmake.in +++ b/cmake/AudioManagerUtilitiesConfig.cmake.in @@ -2,6 +2,8 @@ set_and_check(AudioManagerUtilities_INCLUDE_DIRS @CMAKE_INSTALL_PREFIX@/include/@LIB_INSTALL_SUFFIX@/AudioManagerUtilities) find_library(AudioManagerUtilities_LIBRARY NAMES AudioManagerUtilities HINTS ${@CMAKE_INSTALL_PREFIX@/lib}) +set(AudioManagerUtilities_INCLUDE_DIRS ${AudioManagerUtilities_INCLUDE_DIRS} @AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE@) + set(AudioManagerUtilities_LIBRARIES @AUDIO_MANAGER_UTILITIES_LIBS@ ${AudioManagerUtilities_LIBRARY}) set(DAEMONVERSION "@DAEMONVERSION@") diff --git a/cmake/audiomanagerutilities.pc.in b/cmake/audiomanagerutilities.pc.in index 2227cf1..8469848 100644 --- a/cmake/audiomanagerutilities.pc.in +++ b/cmake/audiomanagerutilities.pc.in @@ -1,4 +1,4 @@ -libdir=@CMAKE_INSTALL_PREFIX@/lib/@LIB_INSTALL_SUFFIX@ +libdir=@CMAKE_INSTALL_PREFIX@/lib includedir=@CMAKE_INSTALL_PREFIX@/include/@LIB_INSTALL_SUFFIX@/AudioMangerUtilities Name: Audiomanager Utilities -- cgit v1.2.1