g/mumsi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up CMakeFiles.txt and includes.

Browse Source
This commit is contained in:
Michał Słomkowski 2015-11-04 01:22:59 +01:00
parent 058b8778cd
commit b87e1f840d
7 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.0.0) cmake_minimum_required(VERSION 3.0.1)
project(mumsi) project(mumsi)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
INCLUDE(FindPkgConfig) INCLUDE(FindPkgConfig)
find_package(Boost COMPONENTS system unit_test_framework program_options filesystem REQUIRED) find_package(Boost COMPONENTS system REQUIRED)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(PJSIP "libpjproject") pkg_check_modules(PJSIP "libpjproject")
@ -25,20 +25,9 @@ set(SOURCE_FILES
Configuration.cpp Configuration.cpp
Configuration.hpp) Configuration.hpp)
#set(TEST_SOURCE_FILES
# SoundSampleQueueTest.cpp
#)
add_executable(mumsi ${SOURCE_FILES} main.cpp) add_executable(mumsi ${SOURCE_FILES} main.cpp)
target_link_libraries(mumsi ${PJSIP_LIBRARIES}) target_link_libraries(mumsi ${PJSIP_LIBRARIES})
target_link_libraries(mumsi ${LOG4CPP_LIBRARIES}) target_link_libraries(mumsi ${LOG4CPP_LIBRARIES})
target_link_libraries(mumsi ${Boost_LIBRARIES}) target_link_libraries(mumsi ${Boost_LIBRARIES})
target_link_libraries(mumsi mumlib) target_link_libraries(mumsi mumlib)
#add_executable(mumsi_test ${SOURCE_FILES} ${TEST_SOURCE_FILES} test_main.cpp)
#target_link_libraries(mumsi_test ${OPUS_LIBRARIES})
#target_link_libraries(mumsi_test ${PJSIP_LIBRARIES})
#target_link_libraries(mumsi_test ${LOG4CPP_LIBRARIES})
#target_link_libraries(mumsi_test ${SNDFILE_LIBRARIES})
#target_link_libraries(mumsi_test ${Boost_LIBRARIES})
#target_link_libraries(mumsi_test mumble)

5
Configuration.cpp
View File

@ -1,8 +1,9 @@
#include <fstream> #include "Configuration.hpp"
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/ini_parser.hpp> #include <boost/property_tree/ini_parser.hpp>
#include "Configuration.hpp" #include <fstream>
using namespace config; using namespace config;

5
Configuration.hpp
View File

@ -1,10 +1,11 @@
#pragma once #pragma once
#include <boost/noncopyable.hpp>
#include <vector>
#include <string> #include <string>
#include <stdexcept> #include <stdexcept>
#include <boost/noncopyable.hpp>
namespace config { namespace config {
class ConfigException : public std::runtime_error { class ConfigException : public std::runtime_error {

4
MumbleCommunicator.cpp
View File

@ -1,8 +1,8 @@
#include "MumbleCommunicator.hpp"
#include <cstring> #include <cstring>
#include <functional> #include <functional>
#include "MumbleCommunicator.hpp"
namespace mumble { namespace mumble {
class MumlibCallback : public mumlib::BasicCallback { class MumlibCallback : public mumlib::BasicCallback {
public: public:

6
MumbleCommunicator.hpp
View File

@ -4,9 +4,11 @@
#include <mumlib.hpp> #include <mumlib.hpp>
#include <log4cpp/Category.hh>
#include <boost/noncopyable.hpp>
#include <string> #include <string>
#include <stdexcept> #include <stdexcept>
#include <log4cpp/Category.hh>
namespace mumble { namespace mumble {
@ -17,7 +19,7 @@ namespace mumble {
class MumlibCallback; class MumlibCallback;
class MumbleCommunicator : public ICommunicator { class MumbleCommunicator : public ICommunicator, boost::noncopyable {
public: public:
MumbleCommunicator( MumbleCommunicator(
boost::asio::io_service &ioService); boost::asio::io_service &ioService);

3
PjsuaCommunicator.cpp
View File

@ -2,7 +2,8 @@
#include <pjlib.h> #include <pjlib.h>
#include <pjsua-lib/pjsua.h> #include <pjsua-lib/pjsua.h>
#include <boost/algorithm/string/replace.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/format.hpp> #include <boost/format.hpp>
using namespace std; using namespace std;

8
PjsuaCommunicator.hpp
View File

@ -4,12 +4,12 @@
#include <pjmedia.h> #include <pjmedia.h>
#include <log4cpp/Category.hh>
#include <boost/noncopyable.hpp>
#include <string> #include <string>
#include <stdexcept> #include <stdexcept>
#include <log4cpp/Category.hh>
#include <sndfile.hh>
#include <mutex> #include <mutex>
#include <condition_variable>
namespace sip { namespace sip {
@ -47,7 +47,7 @@ namespace sip {
pj_status_t MediaPort_putFrameRawCallback(pjmedia_port *port, pjmedia_frame *frame); pj_status_t MediaPort_putFrameRawCallback(pjmedia_port *port, pjmedia_frame *frame);
class PjsuaCommunicator : public ICommunicator { class PjsuaCommunicator : public ICommunicator, boost::noncopyable {
public: public:
PjsuaCommunicator(); PjsuaCommunicator();