Fixed build-scripts...

CMakeLists.txt

@@ -4,10 +4,8 @@ project(sdr)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake)
 include(InstallHeadersWithDirectory)
 
-find_package(Qt5Core REQUIRED)
-find_package(Qt5Declarative REQUIRED)
-find_package(Qt5Widgets REQUIRED)
-find_package(Qt5LinguistTools REQUIRED)
+find_package(Qt5Core)
+find_package(Qt5Widgets)
 
 find_package(FFTW)
 find_package(FFTWSingle)
@@ -15,14 +13,18 @@ find_package(PortAudio)
 find_package(RTLSDR)
 
 ADD_DEFINITIONS(${Qt5Widgets_DEFINITIONS})
+
 INCLUDE_DIRECTORIES(${Qt5Core_INCLUDE_DIRS})
-INCLUDE_DIRECTORIES(${Qt5Declarative_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(${Qt5Widgets_INCLUDE_DIRS})
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/sdr)
-INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/sdr)
+INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/src)
 INCLUDE_DIRECTORIES(${PORTAUDIO_INCLUDE_DIRS})
 
 # Set some variables for the configuration file
+IF(Qt5Core_FOUND AND Qt5Widgets_FOUND)
+  set(SDR_WITH_QT5 ON)
+ENDIF(Qt5Core_FOUND AND Qt5Widgets_FOUND)
+
 IF(FFTW_FOUND)
   set(SDR_WITH_FFTW ON)
 ELSE(FFTW_FOUND)
@@ -52,8 +54,8 @@ set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ggdb")
 
 
-LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/sdr)
-LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/sdr/gui)
+LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/src)
+LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/src/gui)
 
 IF(CMAKE_BUILD_TYPE MATCHES DEBUG)
   SET(SDR_DEBUG ON)
@@ -61,23 +63,13 @@ ENDIF(CMAKE_BUILD_TYPE MATCHES DEBUG)
 
 
 # Create config.hh
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/sdr/config.hh.in
-               ${CMAKE_CURRENT_BINARY_DIR}/sdr/config.hh)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/src/config.hh.in
+               ${CMAKE_CURRENT_BINARY_DIR}/src/config.hh)
 
 # Add core library, and unit tests
-add_subdirectory(sdr)
+add_subdirectory(src)
 add_subdirectory(test)
-add_subdirectory(rx)
-
-# Add DSO application, iff portaudio is present
-IF(SDR_WITH_PORTAUDIO)
-  add_subdirectory(dso)
-ENDIF(SDR_WITH_PORTAUDIO)
-
-# Add examples, if all libraries are present:
-IF(SDR_WITH_PORTAUDIO AND SDR_WITH_FFTW AND SDR_WITH_RTLSDR)
 add_subdirectory(examples)
-ENDIF(SDR_WITH_PORTAUDIO AND SDR_WITH_FFTW AND SDR_WITH_RTLSDR)
 
 # Source distribution packages:
 set(CPACK_PACKAGE_VERSION_MAJOR "0")
@@ -89,10 +81,4 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME
 set(CPACK_SOURCE_IGNORE_FILES
   "/build/;/doc/;/dist/;/.git/;.dat$;.wav$;~$;.qm$;${CPACK_SOURCE_IGNORE_FILES}")
 
-# Configure NSIS installer for windows
-set(CPACK_NSIS_PACKAGE_NAME "DSO")
-set(CPACK_NSIS_DISPLAY_NAME "DSO")
-set(CPACK_NSIS_CONTACT "hmatuschek@gmail.com")
-set(CPACK_PACKAGE_EXECUTABLES dso "DSO")
-
 include(CPack)

src/CMakeLists.txt

@@ -29,7 +29,7 @@ set_target_properties(libsdr PROPERTIES OUTPUT_NAME sdr)
 set_target_properties(libsdr PROPERTIES DEPENDS libsdr_hdrs)
 target_link_libraries(libsdr ${LIBS})
 
-if(SDR_WITH_FFTW)
+if(SDR_WITH_FFTW AND SDR_WITH_QT5)
   set(libsdr_gui_SOURCES gui/spectrum.cc gui/spectrumview.cc gui/waterfallview.cc)
   set(libsdr_gui_MOC_HEADERS gui/spectrum.hh gui/spectrumview.hh gui/waterfallview.hh)
   set(libsdr_gui_HEADERS ${libsdr_gui_MOC_HEADERS} gui/gui.hh)
@@ -38,16 +38,5 @@ if(SDR_WITH_FFTW)
   add_library(libsdr-gui SHARED ${libsdr_gui_SOURCES} ${libsdr_gui_MOC_SOURCES})
   set_target_properties(libsdr-gui PROPERTIES OUTPUT_NAME sdr-gui)
   target_link_libraries(libsdr-gui libsdr ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES})
-endif(SDR_WITH_FFTW)
+endif(SDR_WITH_FFTW AND SDR_WITH_QT5)
 
-
-IF(WIN32 OR WIN64)
- install(TARGETS libsdr DESTINATION bin)
- install(FILES "C:/MinGW/bin/pthreadGC2.dll" DESTINATION bin)
- install(FILES "C:/MinGW/bin/libgcc_s_dw2-1.dll" DESTINATION bin)
- install(FILES "C:/MinGW/bin/libportaudio-2.dll" DESTINATION bin)
- install(FILES "C:/Qt/4.8.6/bin/QtCored4.dll" DESTINATION bin)
- install(FILES "C:/Qt/4.8.6/bin/QtGuid4.dll" DESTINATION bin)
- install(FILES "C:/Qt/4.8.6/bin/libwinpthread-1.dll" DESTINATION bin)
- install(FILES "C:/Qt/4.8.6/bin/libstdc++-6.dll" DESTINATION bin)
-ENDIF(WIN32 OR WIN64)

src/combine.hh

@@ -5,6 +5,7 @@
 #include "traits.hh"
 #include "node.hh"
 #include "buffer.hh"
+#include "logger.hh"
 #include <limits>
 
 namespace sdr {

src/config.hh.in

@@ -1,5 +1,6 @@
 #cmakedefine SDR_DEBUG 1
 
+#cmakedefine SDR_WITH_QT5 1
 #cmakedefine SDR_WITH_FFTW 1
 #cmakedefine SDR_WITH_PORTAUDIO 1
 #cmakedefine SDR_WITH_RTLSDR 1

src/demod.hh

@@ -152,7 +152,7 @@ public:
 #ifdef SDR_DEBUG
       LogMessage msg(LOG_WARNING);
       msg << "SSBDemod: Drop buffer.";
-      Logger.get().log(msg);
+      Logger::get().log(msg);
 #endif
     }
   }