summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mueller <christian@lmuc329619u.(none)>2011-07-19 20:46:50 +0200
committerChristian Mueller <christian@lmuc329619u.(none)>2011-07-19 20:46:50 +0200
commit4bcad418c039cad5690e62ed63e2b4260c12a517 (patch)
tree6041a61c54cfb1572cdb7c5d5921acc42f9e8262
parent4a67d4c668148dd8b0cd9c818ab45c7c6ac9841a (diff)
downloadaudiomanager-4bcad418c039cad5690e62ed63e2b4260c12a517.tar.gz
make it compile on 10.04
-rw-r--r--AudioManagerDaemon/CMakeLists.txt2
-rw-r--r--AudioManagerDaemon/DataBaseHandler.cpp3
-rw-r--r--PluginHookStandard/CMakeLists.txt2
3 files changed, 2 insertions, 5 deletions
diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt
index 4595356..60d9216 100644
--- a/AudioManagerDaemon/CMakeLists.txt
+++ b/AudioManagerDaemon/CMakeLists.txt
@@ -22,8 +22,6 @@ set(DBUS_FOLDER ${CMAKE_SOURCE_DIR}/../dbusInterfaces)
set(DOC_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/../doc/AudioManager)
set(DOCUMENT $ENV{gendoc})
-cmake_policy(SET CMP0015 NEW)
-
file(MAKE_DIRECTORY ${DOC_OUTPUT_PATH})
FIND_PACKAGE(PkgConfig)
diff --git a/AudioManagerDaemon/DataBaseHandler.cpp b/AudioManagerDaemon/DataBaseHandler.cpp
index ee9c1d0..f72d7a8 100644
--- a/AudioManagerDaemon/DataBaseHandler.cpp
+++ b/AudioManagerDaemon/DataBaseHandler.cpp
@@ -36,10 +36,11 @@
DataBaseHandler::DataBaseHandler() {
//knock down database
- m_path = "/home/blacky";
+ m_path = "/tmp";
m_path.append("/");
m_path.append(AUDIO_DATABASE);
+ DLT_LOG(AudioManager, DLT_LOG_INFO, DLT_STRING("Database path:"), DLT_STRING(m_path.c_str()));
std::ifstream infile(m_path.c_str());
diff --git a/PluginHookStandard/CMakeLists.txt b/PluginHookStandard/CMakeLists.txt
index d0d03f4..e913aff 100644
--- a/PluginHookStandard/CMakeLists.txt
+++ b/PluginHookStandard/CMakeLists.txt
@@ -10,8 +10,6 @@ set(LIBRARY_OUTPUT_PATH ../plugins)
set(DOC_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/../doc/PluginHookStandard)
set(DOCUMENT $ENV{gendoc})
-cmake_policy(SET CMP0015 NEW)
-
file(MAKE_DIRECTORY ${DOC_OUTPUT_PATH})
INCLUDE_DIRECTORIES(