summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Lorenz <jlorenz@de.adit-jv.com>2017-06-22 10:56:20 +0200
committerJens Lorenz <jlorenz@de.adit-jv.com>2017-09-29 11:42:01 +0200
commit50bbb68460af25dcba4110b11b4f0bf61d6e111a (patch)
tree56b8b489248a0a77169e47a919847bde107b1c87
parent31922cca3a063b2f413967312ae1f927d624a1ed (diff)
downloadaudiomanager-50bbb68460af25dcba4110b11b4f0bf61d6e111a.tar.gz
CMake: Add pthread support
If DLT is turned off, CAmDltWrapper needs linkage to pthread. Furthermore, CAmSerializer doesn't need to #include pthread. Signed-off-by: Guerra Mattia <mguerra@de.adit-jv.com>
-rw-r--r--AudioManagerUtilities/CMakeLists.txt6
-rw-r--r--AudioManagerUtilities/include/CAmSerializer.h1
-rw-r--r--AudioManagerUtilities/src/CAmDltWrapper.cpp1
3 files changed, 5 insertions, 3 deletions
diff --git a/AudioManagerUtilities/CMakeLists.txt b/AudioManagerUtilities/CMakeLists.txt
index 6e9a06f..7c502c5 100644
--- a/AudioManagerUtilities/CMakeLists.txt
+++ b/AudioManagerUtilities/CMakeLists.txt
@@ -17,7 +17,9 @@
CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
-PROJECT(AudioManagerUtilities LANGUAGES CXX VERSION ${DAEMONVERSION})
+PROJECT(AudioManagerUtilities LANGUAGES C CXX VERSION ${DAEMONVERSION})
+
+FIND_PACKAGE(Threads REQUIRED)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
@@ -141,7 +143,7 @@ LINK_DIRECTORIES(${AUDIOMANAGER_UTILITIES_LIB_DIRECTORIES})
ADD_LIBRARY(AudioManagerUtilities ${LIBRARY_TYPE} ${AUDIO_MANAGER_UTILITIES_SRCS_CXX})
-TARGET_LINK_LIBRARIES(AudioManagerUtilities ${AUDIO_MANAGER_UTILITIES_LIBS})
+TARGET_LINK_LIBRARIES(AudioManagerUtilities ${AUDIO_MANAGER_UTILITIES_LIBS} ${CMAKE_THREAD_LIBS_INIT})
set_target_properties(AudioManagerUtilities PROPERTIES VERSION ${AudioManagerUtilities_VERSION} SOVERSION ${AudioManagerUtilities_VERSION_MAJOR})
diff --git a/AudioManagerUtilities/include/CAmSerializer.h b/AudioManagerUtilities/include/CAmSerializer.h
index 6bd6143..8abdf90 100644
--- a/AudioManagerUtilities/include/CAmSerializer.h
+++ b/AudioManagerUtilities/include/CAmSerializer.h
@@ -18,7 +18,6 @@
#ifndef CAMSERIALIZER_H_
#define CAMSERIALIZER_H_
-#include <pthread.h>
#include <deque>
#include <cassert>
#include <memory>
diff --git a/AudioManagerUtilities/src/CAmDltWrapper.cpp b/AudioManagerUtilities/src/CAmDltWrapper.cpp
index 37a5ff0..742b396 100644
--- a/AudioManagerUtilities/src/CAmDltWrapper.cpp
+++ b/AudioManagerUtilities/src/CAmDltWrapper.cpp
@@ -29,6 +29,7 @@
#include <string.h>
#include <chrono>
#include <ctime>
+#include <unistd.h>
namespace am
{