From d718b619aa74db45958b35f5e93477b1e3d92676 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Tue, 18 Aug 2020 10:34:14 +0800 Subject: [PATCH 01/13] DSView.desktop: remove known version in desktop file Fix error: value "0.96" for key "Version" in group "Desktop Entry" is not a known version. Version of the Desktop Entry Specification that the desktop entry conforms with. Entries that confirm with this version of the specification should use 1.1. Note that the version field is not required to be present, so I removed it. See also: https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html Signed-off-by: Huang Rui --- DSView/DSView.desktop | 1 - 1 file changed, 1 deletion(-) diff --git a/DSView/DSView.desktop b/DSView/DSView.desktop index fba3202a..4095b98e 100755 --- a/DSView/DSView.desktop +++ b/DSView/DSView.desktop @@ -1,5 +1,4 @@ [Desktop Entry] -Version=0.96 Exec=/usr/local/bin/DSView Name=DSView Comment=GUI Program for DreamSourceLab USB-based Instruments From 6a89302176e1976168a96b2b26e8fba8e799a6ee Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Tue, 18 Aug 2020 10:52:17 +0800 Subject: [PATCH 02/13] DSView.desktop: add additional categories Change Categories=Development;Electronics;Qt; https://specifications.freedesktop.org/menu-spec/latest/apas02.html Re-order the item list to fit desktop file skel. Signed-off-by: Huang Rui --- DSView/DSView.desktop | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/DSView/DSView.desktop b/DSView/DSView.desktop index 4095b98e..bf2a6b10 100755 --- a/DSView/DSView.desktop +++ b/DSView/DSView.desktop @@ -1,8 +1,9 @@ [Desktop Entry] -Exec=/usr/local/bin/DSView +Type=Application +Encoding=UTF-8 Name=DSView Comment=GUI Program for DreamSourceLab USB-based Instruments +Exec=/usr/local/bin/DSView Icon=/usr/local/share/DSView/logo.png -Type=Application Terminal=false -Categories=Development +Categories=Development;Electronics;Qt; From 06cf5b16380c3aa27d82a3ccae157eb15a5ffecd Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Tue, 18 Aug 2020 10:54:33 +0800 Subject: [PATCH 03/13] DSView.desktop: fix Exec path Under some linux distro, program may not installed in /usr/local/bin/ Debian/Ubuntu/RHEL uses /usr/bin as package default install path Signed-off-by: Huang Rui --- DSView/DSView.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DSView/DSView.desktop b/DSView/DSView.desktop index bf2a6b10..5464c8b5 100755 --- a/DSView/DSView.desktop +++ b/DSView/DSView.desktop @@ -3,7 +3,7 @@ Type=Application Encoding=UTF-8 Name=DSView Comment=GUI Program for DreamSourceLab USB-based Instruments -Exec=/usr/local/bin/DSView +Exec=DSView Icon=/usr/local/share/DSView/logo.png Terminal=false Categories=Development;Electronics;Qt; From a4d76a2a7a95dd8b85904fbcbdebe24da901fecc Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Tue, 18 Aug 2020 10:58:17 +0800 Subject: [PATCH 04/13] DSView.desktop: add TryExec=DSView TryExec: If the path is not an absolute path, the file is looked up in the $PATH environment variable. If the file is not present or if it is not executable, the entry may be ignored (not be used in menus, for example). https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html Signed-off-by: Huang Rui --- DSView/DSView.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/DSView/DSView.desktop b/DSView/DSView.desktop index 5464c8b5..063e3a0f 100755 --- a/DSView/DSView.desktop +++ b/DSView/DSView.desktop @@ -3,6 +3,7 @@ Type=Application Encoding=UTF-8 Name=DSView Comment=GUI Program for DreamSourceLab USB-based Instruments +TryExec=DSView Exec=DSView Icon=/usr/local/share/DSView/logo.png Terminal=false From dcff26b72c8ebb4abae14a506089e9dcae872219 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Tue, 18 Aug 2020 11:21:38 +0800 Subject: [PATCH 05/13] Fix dsview desktop icon file install path Icon files should be installed into $prefix/share/icons/hicolor/scalable/apps. Also use $prefix/share/pixmaps to solve compatibility problems under different DE. https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html Signed-off-by: Huang Rui --- DSView/CMakeLists.txt | 4 +++- DSView/DSView.desktop | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/DSView/CMakeLists.txt b/DSView/CMakeLists.txt index 29f848dd..9d129169 100755 --- a/DSView/CMakeLists.txt +++ b/DSView/CMakeLists.txt @@ -423,12 +423,14 @@ set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_ install(TARGETS ${PROJECT_NAME} DESTINATION bin/) install(DIRECTORY res DESTINATION share/${PROJECT_NAME}) install(FILES icons/logo.svg DESTINATION share/${PROJECT_NAME} RENAME logo.svg) +install(FILES icons/logo.svg DESTINATION share/icons/hicolor/scalable/apps RENAME dsview.svg) +install(FILES icons/logo.svg DESTINATION share/pixmaps RENAME dsview.svg) install(FILES ../NEWS25 DESTINATION share/${PROJECT_NAME} RENAME NEWS25) install(FILES ../NEWS31 DESTINATION share/${PROJECT_NAME} RENAME NEWS31) install(FILES ../ug25.pdf DESTINATION share/${PROJECT_NAME} RENAME ug25.pdf) install(FILES ../ug31.pdf DESTINATION share/${PROJECT_NAME} RENAME ug31.pdf) install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/) -install(FILES DSView.desktop DESTINATION /usr/share/applications/) +install(FILES DSView.desktop DESTINATION /usr/share/applications/ RENAME dsview.desktop) #=============================================================================== #= Packaging (handled by CPack) diff --git a/DSView/DSView.desktop b/DSView/DSView.desktop index 063e3a0f..4e74e056 100755 --- a/DSView/DSView.desktop +++ b/DSView/DSView.desktop @@ -5,6 +5,6 @@ Name=DSView Comment=GUI Program for DreamSourceLab USB-based Instruments TryExec=DSView Exec=DSView -Icon=/usr/local/share/DSView/logo.png +Icon=dsview.svg Terminal=false Categories=Development;Electronics;Qt; From a73ade35ea601ed4bdfeb9171a54712d9ab97931 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Tue, 18 Aug 2020 12:08:05 +0800 Subject: [PATCH 06/13] DSView/DSView.desktop: remove svg extension to fix QA value "dsview.svg" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension as described in the Icon Theme Specification if the value is not an absolute path. Signed-off-by: Huang Rui --- DSView/DSView.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DSView/DSView.desktop b/DSView/DSView.desktop index 4e74e056..e1143240 100755 --- a/DSView/DSView.desktop +++ b/DSView/DSView.desktop @@ -5,6 +5,6 @@ Name=DSView Comment=GUI Program for DreamSourceLab USB-based Instruments TryExec=DSView Exec=DSView -Icon=dsview.svg +Icon=dsview Terminal=false Categories=Development;Electronics;Qt; From 90b9664325046a121cf5442c839f31c75bb4a682 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Tue, 18 Aug 2020 12:32:48 +0800 Subject: [PATCH 07/13] CMakeLists.txt: fix udev rule path and clean other path Fix QA Notice: udev rules should be installed in /lib/udev/rules.d /lib/udev/rules.d is for upstream packager and /etc/udev/rules.d is for user. This is intended to make life for distro packagers easier. Udev rule file should have two digit integer prefix, and this hardware may use 60 as the prefix. Closes: https://github.com/DreamSourceLab/DSView/issues/190 Signed-off-by: Huang Rui --- DSView/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DSView/CMakeLists.txt b/DSView/CMakeLists.txt index 9d129169..554952fa 100755 --- a/DSView/CMakeLists.txt +++ b/DSView/CMakeLists.txt @@ -420,7 +420,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_ #------------------------------------------------------------------------------- # Install the executable. -install(TARGETS ${PROJECT_NAME} DESTINATION bin/) +install(TARGETS ${PROJECT_NAME} DESTINATION bin) install(DIRECTORY res DESTINATION share/${PROJECT_NAME}) install(FILES icons/logo.svg DESTINATION share/${PROJECT_NAME} RENAME logo.svg) install(FILES icons/logo.svg DESTINATION share/icons/hicolor/scalable/apps RENAME dsview.svg) @@ -429,8 +429,8 @@ install(FILES ../NEWS25 DESTINATION share/${PROJECT_NAME} RENAME NEWS25) install(FILES ../NEWS31 DESTINATION share/${PROJECT_NAME} RENAME NEWS31) install(FILES ../ug25.pdf DESTINATION share/${PROJECT_NAME} RENAME ug25.pdf) install(FILES ../ug31.pdf DESTINATION share/${PROJECT_NAME} RENAME ug31.pdf) -install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/) -install(FILES DSView.desktop DESTINATION /usr/share/applications/ RENAME dsview.desktop) +install(FILES DreamSourceLab.rules DESTINATION /lib/udev/rules.d RENAME 60-dreamsourcelab.rules) +install(FILES DSView.desktop DESTINATION /usr/share/applications RENAME dsview.desktop) #=============================================================================== #= Packaging (handled by CPack) From 57515b124bc1b1692c8023ada8b04c885680328c Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Tue, 18 Aug 2020 12:58:16 +0800 Subject: [PATCH 08/13] FindFFTW.cmake: fix library path: change locala to local Signed-off-by: Huang Rui --- DSView/CMake/FindFFTW.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DSView/CMake/FindFFTW.cmake b/DSView/CMake/FindFFTW.cmake index df9c8b38..4d1acdda 100755 --- a/DSView/CMake/FindFFTW.cmake +++ b/DSView/CMake/FindFFTW.cmake @@ -16,7 +16,7 @@ FIND_PATH(FFTW_INCLUDE_DIR fftw3.h SET(FFTW_NAMES ${FFTW_NAMES} fftw3 fftw3f fftw3-3) FIND_LIBRARY(FFTW_LIBRARY NAMES ${FFTW_NAMES} - PATHS /usr/lib /usr/local/lib /opt/locala/lib + PATHS /usr/lib /usr/local/lib /opt/local/lib ) # Find threads part of FFTW From 1fdcc95997f61d33e3ed19c0b17204631ccb8295 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Tue, 18 Aug 2020 13:11:22 +0800 Subject: [PATCH 09/13] INSTALL: trim trailing whitespaces Signed-off-by: Huang Rui --- INSTALL | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/INSTALL b/INSTALL index e274599d..4c95093d 100755 --- a/INSTALL +++ b/INSTALL @@ -48,12 +48,12 @@ Fedora (18, 19): python3-devel qt-devel boost-devel check libfftw3-devel Arch: - $ pacman -S base-devel git cmake glib2 libzip libusb check + $ pacman -S base-devel git cmake glib2 libzip libusb check python boost qt5 fftw Step3: Building - + $ cd libsigrok4DSL $ ./autogen.sh $ ./configure @@ -72,11 +72,11 @@ Step3: Building $ cmake . /* - * If this step fails, - * make sure that your pkg-config is properly configured - * to find the libsigrok and libsigrokdecode libraries - * (It's not by default in Fedora 23). - * To do this add "export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" + * If this step fails, + * make sure that your pkg-config is properly configured + * to find the libsigrok and libsigrokdecode libraries + * (It's not by default in Fedora 23). + * To do this add "export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" * to your ~/.bashrc and reload it `. ~/.bashrc`. */ From b938efdb3f3b2842f8a2281968348ad7116e1cd3 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Tue, 18 Aug 2020 13:15:32 +0800 Subject: [PATCH 10/13] INSTALL: improve documents about PKG_CONFIG_PATH Different distributions may not have the same path requirements for PKGCONFIG Signed-off-by: Huang Rui --- INSTALL | 2 ++ 1 file changed, 2 insertions(+) diff --git a/INSTALL b/INSTALL index 4c95093d..94bdb080 100755 --- a/INSTALL +++ b/INSTALL @@ -77,6 +77,8 @@ Step3: Building * to find the libsigrok and libsigrokdecode libraries * (It's not by default in Fedora 23). * To do this add "export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" + * or "export PKG_CONFIG_PATH=/usr/lib/pkgconfig" + * or "export PKG_CONFIG_PATH=/usr/lib64/pkgconfig" * to your ~/.bashrc and reload it `. ~/.bashrc`. */ From bd0d12243e4dbb4dd934fbf8962dc8589a1eeb17 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Tue, 18 Aug 2020 14:25:55 +0800 Subject: [PATCH 11/13] FindFFTW.cmake: fix 64bit lib search path Signed-off-by: Huang Rui --- DSView/CMake/FindFFTW.cmake | 51 ++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/DSView/CMake/FindFFTW.cmake b/DSView/CMake/FindFFTW.cmake index 4d1acdda..88fc4316 100755 --- a/DSView/CMake/FindFFTW.cmake +++ b/DSView/CMake/FindFFTW.cmake @@ -7,42 +7,59 @@ # also defined, but not for general use are # FFTW_LIBRARY, where to find the FFTW library. -FIND_PATH(FFTW_INCLUDE_DIR fftw3.h -/usr/local/include -/usr/include -/opt/local/lib +FIND_PATH(FFTW_INCLUDE_DIR + NAMES + fftw3.h + PATHS + /usr/local/include + /opt/local/include + /usr/include ) -SET(FFTW_NAMES ${FFTW_NAMES} fftw3 fftw3f fftw3-3) +SET(FFTW_NAMES ${FFTW_NAMES} fftw3 fftw3f fftw3-3 fftw3l) FIND_LIBRARY(FFTW_LIBRARY - NAMES ${FFTW_NAMES} - PATHS /usr/lib /usr/local/lib /opt/local/lib + NAMES + ${FFTW_NAMES} + PATHS + /usr/local/lib64 + /opt/local/lib64 + /usr/lib64 + /usr/local/lib + /opt/local/lib + /usr/lib ) # Find threads part of FFTW SET(FFTW_THREADS_NAMES ${FFTW_THREADS_NAMES} fftw3f_threads fftw3_threads fftw3-3_threads) FIND_LIBRARY(FFTW_THREADS_LIBRARY - NAMES ${FFTW_THREADS_NAMES} - PATHS /usr/lib /usr/local/lib /opt/local/lib + NAMES + ${FFTW_THREADS_NAMES} + PATHS + /usr/local/lib64 + /opt/local/lib64 + /usr/lib64 + /usr/local/lib + /opt/local/lib + /usr/lib ) IF (FFTW_THREADS_LIBRARY AND FFTW_INCLUDE_DIR) - SET(FFTW_THREADS_LIBRARIES ${FFTW_THREADS_LIBRARY}) - SET(FFTW_THREADS_FOUND "YES") + SET(FFTW_THREADS_LIBRARIES ${FFTW_THREADS_LIBRARY}) + SET(FFTW_THREADS_FOUND "YES") ELSE (FFTW_THREADS_LIBRARY AND FFTW_INCLUDE_DIR) SET(FFTW_THREADS_FOUND "NO") ENDIF (FFTW_THREADS_LIBRARY AND FFTW_INCLUDE_DIR) IF (FFTW_THREADS_FOUND) - IF (NOT FFTW_THREADS_FIND_QUIETLY) - MESSAGE(STATUS "Found FFTW threads: ${FFTW_THREADS_LIBRARIES}") - ENDIF (NOT FFTW_THREADS_FIND_QUIETLY) + IF (NOT FFTW_THREADS_FIND_QUIETLY) + MESSAGE(STATUS "Found FFTW threads: ${FFTW_THREADS_LIBRARIES}") + ENDIF (NOT FFTW_THREADS_FIND_QUIETLY) ELSE (FFTW_THREADS_FOUND) - IF (FFTW_THREADS_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find FFTW threads library") - ENDIF (FFTW_THREADS_FIND_REQUIRED) + IF (FFTW_THREADS_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find FFTW threads library") + ENDIF (FFTW_THREADS_FIND_REQUIRED) ENDIF (FFTW_THREADS_FOUND) From b36031abc5169c750d8514afbb30ca5d58f9596a Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Tue, 18 Aug 2020 14:26:31 +0800 Subject: [PATCH 12/13] Findlibusb-1.0.cmake: fix 64bit lib search path Signed-off-by: Huang Rui --- DSView/CMake/Findlibusb-1.0.cmake | 64 ++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 14 deletions(-) diff --git a/DSView/CMake/Findlibusb-1.0.cmake b/DSView/CMake/Findlibusb-1.0.cmake index 5c831485..0bf79a24 100755 --- a/DSView/CMake/Findlibusb-1.0.cmake +++ b/DSView/CMake/Findlibusb-1.0.cmake @@ -1,17 +1,45 @@ +# - Try to find libusb-1.0 +# Once done this will define # -# LIBUSB_1_FOUND - system has libusb -# LIBUSB_1_INCLUDE_DIRS - the libusb include directory -# LIBUSB_1_LIBRARIES - Link these to use libusb -# LIBUSB_1_DEFINITIONS - Compiler switches required for using libusb +# LIBUSB_1_FOUND - system has libusb +# LIBUSB_1_INCLUDE_DIRS - the libusb include directory +# LIBUSB_1_LIBRARIES - Link these to use libusb +# LIBUSB_1_DEFINITIONS - Compiler switches required for using libusb # -# Adapted from cmake-modules Google Code project +# Adapted from cmake-modules Google Code project # -# Copyright (c) 2006 Andreas Schneider +# Copyright (c) 2006 Andreas Schneider # -# (Changes for libusb) Copyright (c) 2008 Kyle Machulis +# (Changes for libusb) Copyright (c) 2008 Kyle Machulis # # Redistribution and use is allowed according to the terms of the New BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# +# CMake-Modules Project New BSD License +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# * Neither the name of the CMake-Modules Project nor the names of its +# contributors may be used to endorse or promote products derived from this +# software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # @@ -21,18 +49,26 @@ if (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS) else (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS) find_path(LIBUSB_1_INCLUDE_DIR NAMES -libusb-1.0/libusb.h + libusb.h PATHS /usr/local/include -PATH_SUFFIXES -libusb-1.0 + /opt/local/include + /usr/include + + PATH_SUFFIXES + libusb-1.0 ) find_library(LIBUSB_1_LIBRARY NAMES - usb-1.0 + usb-1.0 usb PATHS + /usr/local/lib64 + /opt/local/lib64 + /usr/lib64 /usr/local/lib + /opt/local/lib + /usr/lib ) set(LIBUSB_1_INCLUDE_DIRS @@ -49,8 +85,8 @@ libusb-1.0 if (LIBUSB_1_FOUND) if (NOT libusb_1_FIND_QUIETLY) message(STATUS "Found libusb-1.0:") -message(STATUS " - Includes: ${LIBUSB_1_INCLUDE_DIRS}") -message(STATUS " - Libraries: ${LIBUSB_1_LIBRARIES}") + message(STATUS " - Includes: ${LIBUSB_1_INCLUDE_DIRS}") + message(STATUS " - Libraries: ${LIBUSB_1_LIBRARIES}") endif (NOT libusb_1_FIND_QUIETLY) else (LIBUSB_1_FOUND) if (libusb_1_FIND_REQUIRED) From fddde925a7a5fa1994b64c187ae037ca97d3103d Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Tue, 18 Aug 2020 17:14:40 +0800 Subject: [PATCH 13/13] FindFFTW.cmake: adjust fft library order The function used in this program is fftw_plan_r2r_1d, so fftw3 is the needed library should be moved to the first order. Signed-off-by: Huang Rui --- DSView/CMake/FindFFTW.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DSView/CMake/FindFFTW.cmake b/DSView/CMake/FindFFTW.cmake index 88fc4316..0b4277f3 100755 --- a/DSView/CMake/FindFFTW.cmake +++ b/DSView/CMake/FindFFTW.cmake @@ -16,7 +16,7 @@ FIND_PATH(FFTW_INCLUDE_DIR /usr/include ) -SET(FFTW_NAMES ${FFTW_NAMES} fftw3 fftw3f fftw3-3 fftw3l) +SET(FFTW_NAMES ${FFTW_NAMES} fftw3 fftw3f fftw3l fftw3-3) FIND_LIBRARY(FFTW_LIBRARY NAMES ${FFTW_NAMES} @@ -31,7 +31,7 @@ FIND_LIBRARY(FFTW_LIBRARY # Find threads part of FFTW -SET(FFTW_THREADS_NAMES ${FFTW_THREADS_NAMES} fftw3f_threads fftw3_threads fftw3-3_threads) +SET(FFTW_THREADS_NAMES ${FFTW_THREADS_NAMES} fftw3_threads fftw3f_threads fftw3l_threads fftw3-3_threads) FIND_LIBRARY(FFTW_THREADS_LIBRARY NAMES ${FFTW_THREADS_NAMES}