From bec2eb209bf776c19e1a32d2d774cd65934570a5 Mon Sep 17 00:00:00 2001 From: Davide Gerhard Date: Thu, 2 May 2019 16:04:43 +0200 Subject: [PATCH] fix windows compile error --- CMakeLists.txt | 6 +++++- appbench/main.cpp | 4 ++++ appsrv/main.cpp | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b6411d6ad..aa2ae7694 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,7 +79,11 @@ endif() # declare build structures # !! change sdrbase/plugin/pluginmanager.cpp too !! -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/) +if(WIN32) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +else() + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/) +endif() set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(BUILD_PLUGINS_DIR ${CMAKE_BINARY_DIR}/lib/plugins) diff --git a/appbench/main.cpp b/appbench/main.cpp index 909e983ff..44be72893 100644 --- a/appbench/main.cpp +++ b/appbench/main.cpp @@ -34,6 +34,7 @@ void handler(int sig) { QCoreApplication::quit(); } +#ifndef _WIN32 void catchUnixSignals(const std::vector& quitSignals) { sigset_t blocking_mask; sigemptyset(&blocking_mask); @@ -51,6 +52,7 @@ void catchUnixSignals(const std::vector& quitSignals) { sigaction(*it, &sa, 0); } } +#endif static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *logger) { @@ -60,9 +62,11 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo QCoreApplication::setApplicationName("SDRangelBench"); QCoreApplication::setApplicationVersion(SDRANGEL_VERSION); +#ifndef _WIN32 int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP}; std::vector vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int)); catchUnixSignals(vsig); +#endif ParserBench parser; parser.parse(a); diff --git a/appsrv/main.cpp b/appsrv/main.cpp index f8085335e..a72fd0892 100644 --- a/appsrv/main.cpp +++ b/appsrv/main.cpp @@ -33,6 +33,7 @@ void handler(int sig) { QCoreApplication::quit(); } +#ifndef _WIN32 void catchUnixSignals(const std::vector& quitSignals) { sigset_t blocking_mask; sigemptyset(&blocking_mask); @@ -50,6 +51,7 @@ void catchUnixSignals(const std::vector& quitSignals) { sigaction(*it, &sa, 0); } } +#endif static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *logger) { @@ -59,9 +61,11 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo QCoreApplication::setApplicationName("SDRangelSrv"); QCoreApplication::setApplicationVersion(SDRANGEL_VERSION); +#ifndef _WIN32 int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP}; std::vector vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int)); catchUnixSignals(vsig); +#endif MainParser parser; parser.parse(a);