From e8548991a9e168943ce3d33969dab74d2ea66f42 Mon Sep 17 00:00:00 2001 From: Neeflix Date: Thu, 30 Aug 2018 23:41:28 +0200 Subject: [PATCH] changed template --- FlippR-Driver/CMakeLists.txt | 3 ++- FlippR-Driver/cross-docker/dockerfile | 8 ++++---- FlippR-Driver/src/input/EventNotifier.cpp | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/FlippR-Driver/CMakeLists.txt b/FlippR-Driver/CMakeLists.txt index ede9d9d..0754761 100644 --- a/FlippR-Driver/CMakeLists.txt +++ b/FlippR-Driver/CMakeLists.txt @@ -10,7 +10,8 @@ set(BOOST_COMPONENTS program_options thread timer chrono) ###################### START_CMAKE ####################### cmake_minimum_required(VERSION 3.9.1) -project(FlippR-Driver VERSION 0.1.0 LANGUAGES CXX) +#cmake_minimum_required(VERSION 3.0.2) +project(FlippR-Driver VERSION 0.1.0)# LANGUAGES CXX) #set easylogging flags add_definitions(-DELPP_NO_DEFAULT_LOG_FILE) diff --git a/FlippR-Driver/cross-docker/dockerfile b/FlippR-Driver/cross-docker/dockerfile index 9c6033f..7abcb24 100644 --- a/FlippR-Driver/cross-docker/dockerfile +++ b/FlippR-Driver/cross-docker/dockerfile @@ -1,7 +1,7 @@ FROM sdthirlwall/raspberry-pi-cross-compiler -# axel uses gettext in the build context -RUN install-debian --update cmake +# jojo uses beer to get drunk +RUN install-debian --update cmake libboost-all-dev -# axel links against openssl -RUN install-raspbian --update libboost-dev-all +# jojo links against shit +RUN install-raspbian --update wiringPi diff --git a/FlippR-Driver/src/input/EventNotifier.cpp b/FlippR-Driver/src/input/EventNotifier.cpp index 85373da..579115d 100644 --- a/FlippR-Driver/src/input/EventNotifier.cpp +++ b/FlippR-Driver/src/input/EventNotifier.cpp @@ -65,7 +65,7 @@ void EventNotifier::notify() } // getting a guard and calling all registered handlers - std::lock_guard event_handler_guard(this->event_handler_mutex); + std::lock_guard event_handler_guard(this->event_handler_mutex); for(auto handler : this->event_handlers) { boost::thread handler_caller(boost::bind(&IEventHandler::handle, handler, event));