Peter M. Groen / openbr

Commit d5fb9d9a6b63a22fc24a470b6d5b5fbdef9c3513

Authored by Charles Otto
1 parent 8a633eeb

Fix compilation with network=off, fix multi-process support with network=on

Inline Side-by-side
Showing 2 changed files with 3 additions and 2 deletions
openbr/openbr.cpp
  View file @d5fb9d9
@@ -318,7 +318,7 @@ const char *br_version() @@ -318,7 +318,7 @@ const char *br_version()
318 318
319 void br_slave_process(const char *baseName) 319 void br_slave_process(const char *baseName)
320 { 320 {
321 -#ifndef BR_EMBEDDED 321 +#ifdef BR_WITH_QTNETWORK
322 WorkerProcess *worker = new WorkerProcess; 322 WorkerProcess *worker = new WorkerProcess;
323 worker->transform = Globals->algorithm; 323 worker->transform = Globals->algorithm;
324 worker->baseName = baseName; 324 worker->baseName = baseName;
@@ -326,7 +326,7 @@ void br_slave_process(const char *baseName) @@ -326,7 +326,7 @@ void br_slave_process(const char *baseName)
326 delete worker; 326 delete worker;
327 #else 327 #else
328 (void) baseName; 328 (void) baseName;
329 - qFatal("br_slave_process not supported in embedded builds!"); 329 + qFatal("multiprocess support requires building with QtNetwork enabled (set BR_WITH_QTNETWORK in cmake).");
330 #endif 330 #endif
331 } 331 }
332 332
openbr/plugins/cmake/network.cmake
  View file @d5fb9d9
@@ -7,6 +7,7 @@ if(${BR_WITH_QTNETWORK}) @@ -7,6 +7,7 @@ if(${BR_WITH_QTNETWORK})
7 if(${BR_INSTALL_SHARE}) 7 if(${BR_INSTALL_SHARE})
8 install(FILES ${HTTPPARSER_LICENSE} RENAME http-parser DESTINATION share/openbr/licenses) 8 install(FILES ${HTTPPARSER_LICENSE} RENAME http-parser DESTINATION share/openbr/licenses)
9 endif() 9 endif()
  10 + add_definitions(-DBR_WITH_QTNETWORK)
10 else() 11 else()
11 set(BR_EXCLUDED_PLUGINS ${BR_EXCLUDED_PLUGINS} plugins/core/processwrapper.cpp 12 set(BR_EXCLUDED_PLUGINS ${BR_EXCLUDED_PLUGINS} plugins/core/processwrapper.cpp
12 plugins/io/download.cpp 13 plugins/io/download.cpp