Skip to content

Commit

Permalink
feat: replace FFTW with PFFFT and improve FFT UI and error reporting
Browse files Browse the repository at this point in the history
  • Loading branch information
hello-adam authored Nov 11, 2021
2 parents 33613e9 + 89ada5a commit d23d63c
Show file tree
Hide file tree
Showing 17 changed files with 218 additions and 618 deletions.
24 changes: 12 additions & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ if (BUILDING_WITH_CONAN)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CONAN_LIB_DIRS_QT}/cmake/Qt5Core")
include(conan_qt_executables_variables)
else()
find_package(PkgConfig)

# Qt
find_package(Qt5Core CONFIG REQUIRED)
find_package(Qt5Widgets CONFIG REQUIRED)
Expand All @@ -98,15 +100,13 @@ else()
find_package(PCAP REQUIRED)
endif()

# FFTW
if (WIN32)
find_package(FFTW COMPONENTS DOUBLE_LIB REQUIRED)
else()
find_package(FFTW COMPONENTS DOUBLE_LIB DOUBLE_THREADS_LIB REQUIRED)
if(NOT WIN32)
# Libusb
find_package(libusb-1.0 REQUIRED)
endif()

# Libusb
find_package(libusb-1.0 REQUIRED)
# PFFFT
find_package(PFFFT REQUIRED)

endif()

Expand Down Expand Up @@ -200,9 +200,9 @@ set(CPACK_ARCHIVE_COMPONENT_INSTALL OFF)

cpack_add_component("runtime")
set(CPACK_DEBIAN_RUNTIME_PACKAGE_NAME "hobbits")
set(CPACK_DEBIAN_RUNTIME_PACKAGE_DEPENDS "libqt5core5a, libqt5widgets5, libqt5network5, libfftw3-3, libpcap0.8")
set(CPACK_DEBIAN_RUNTIME_PACKAGE_DEPENDS "libqt5core5a, libqt5widgets5, libqt5network5, libpcap0.8")
set(CPACK_RPM_RUNTIME_PACKAGE_NAME "hobbits")
set(CPACK_RPM_RUNTIME_PACKAGE_REQUIRES "qt5-qtbase, qt5-qtbase-gui, fftw, libpcap")
set(CPACK_RPM_RUNTIME_PACKAGE_REQUIRES "qt5-qtbase, qt5-qtbase-gui, libpcap")

cpack_add_component("dev")
set(CPACK_DEBIAN_DEV_PACKAGE_NAME "hobbits-dev")
Expand All @@ -215,8 +215,8 @@ set(CPACK_COMPONENT_DEV_DISPLAY_NAME "Hobbits Development Tools")

set(CPACK_COMPONENTS_ALL runtime dev)

set(CPACK_RPM_PACKAGE_REQUIRES "qt5-qtbase-devel, qt5-qtbase-gui, fftw, libpcap")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "qt5-default, libfftw3-3, libpcap0.8")
set(CPACK_RPM_PACKAGE_REQUIRES "qt5-qtbase-devel, qt5-qtbase-gui, libpcap")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "qt5-default, libpcap0.8")
set(CPACK_COMPONENTS_GROUPING ALL_COMPONENTS_IN_ONE)

#
Expand All @@ -234,7 +234,7 @@ if (NOT BUILDING_WITH_CONAN)
if (SELF_CONTAINED_APP OR APPLE OR WIN32)
pack_qt_libs()
pack_python()
pack_fftw()
pack_pffft()
pack_pcap()
endif()
include(CPack)
Expand Down
11 changes: 0 additions & 11 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
Copyright (c) 2020-2021 Mahlet, Inc.

IMPORTANT: While all the code in hobbits is released under the MIT License
(set out below), some capabilities require FFTW3. FFTW3 is available
under two licenses, the free GPL and a non-free license that allows it to be
used in proprietary programs.

If you distribute FFTW3-enabled hobbits with the GPLed FFTW3 library, your code
must also be GPL licensed. If you do not wish to comply with the terms of the
GPL, you have to buy a FFTW3 license from the copyright holder, MIT. See
http://www.fftw.org/doc/License-and-Copyright.html for more information.


Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
Expand Down
Loading

0 comments on commit d23d63c

Please sign in to comment.