Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e6527957e8e0
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d214f604291c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 24, 2020

  1. Copy the full SHA
    4c6d5d8 View commit details

Commits on Sep 25, 2020

  1. Merge pull request #190 from bvernoux/patch-3

    Add MSYS2 mingw64 ffts lib/include path
    azonenberg authored Sep 25, 2020
    Copy the full SHA
    d214f60 View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 cmake/FindFFTS.cmake
2 changes: 2 additions & 0 deletions cmake/FindFFTS.cmake
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ if(NOT LIBFFTS_FOUND)
/usr
/usr/local
$ENV{HOME}/.local
/mingw64

PATH_SUFFIXES
include/ffts
@@ -17,6 +18,7 @@ if(NOT LIBFFTS_FOUND)
/usr/lib
/usr/local/lib
$ENV{HOME}/.local/lib
/mingw64/lib/
)

if(LIBFFTS_INCLUDE_DIR AND LIBFFTS_LIBRARIES)