From 42086350e7aef749704a60a960f108e0567c7eb9 Mon Sep 17 00:00:00 2001
From: Andreas Suter <andreas.suter@psi.ch>
Date: Sat, 5 May 2018 12:37:52 +0200
Subject: [PATCH] add FFTW3 path if not present in the standard search paths.
 This is needed for macOS with macport.

---
 src/CMakeLists.txt         | 17 +++++++++++++----
 src/classes/CMakeLists.txt | 23 +++++++++++++++++------
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e8eb8c19..d6fd6218 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -48,7 +48,8 @@ add_custom_target(
 #--- add all executables ------------------------------------------------------
 add_executable(any2many git-revision.h any2many.cpp)
 target_include_directories(any2many 
-  BEFORE PRIVATE 
+  BEFORE PRIVATE
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
 )
@@ -57,6 +58,7 @@ target_link_libraries(any2many ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
 add_executable(dump_header git-revision.h dump_header.cpp)
 target_include_directories(dump_header 
   BEFORE PRIVATE 
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${NEXUS_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
@@ -71,6 +73,7 @@ target_link_libraries(dump_header ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
 add_executable(msr2data git-revision.h msr2data.cpp)
 target_include_directories(msr2data 
   BEFORE PRIVATE 
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
 )
@@ -82,6 +85,7 @@ target_link_libraries(msr2msr ${ROOT_LIBRARIES})
 add_executable(musrfit git-revision.h musrfit.cpp)
 target_include_directories(musrfit 
   BEFORE PRIVATE 
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
 )
@@ -90,6 +94,7 @@ target_link_libraries(musrfit ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
 add_executable(musrFT git-revision.h musrFT.cpp)
 target_include_directories(musrFT 
   BEFORE PRIVATE 
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
 )
@@ -97,7 +102,8 @@ target_link_libraries(musrFT  ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} ${MUSRFIT_LIBS}
 
 add_executable(musrRootValidation git-revision.h musrRootValidation.cpp)
 target_include_directories(musrRootValidation 
-  BEFORE PRIVATE 
+  BEFORE PRIVATE
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
     $<BUILD_INTERFACE:${LIBXML2_INCLUDE_DIR}>
@@ -107,6 +113,7 @@ target_link_libraries(musrRootValidation ${ROOT_LIBRARIES} ${MUSRFIT_LIBS} ${LIB
 add_executable(musrt0 git-revision.h musrt0.cpp)
 target_include_directories(musrt0 
   BEFORE PRIVATE 
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
 )
@@ -114,7 +121,8 @@ target_link_libraries(musrt0 ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
 
 add_executable(musrview git-revision.h musrview.cpp)
 target_include_directories(musrview 
-  BEFORE PRIVATE 
+  BEFORE PRIVATE
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
 )
@@ -122,7 +130,8 @@ target_link_libraries(musrview  ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} ${MUSRFIT_LIB
 
 add_executable(write_musrRoot_runHeader git-revision.h write_musrRoot_runHeader.cpp)
 target_include_directories(write_musrRoot_runHeader 
-  BEFORE PRIVATE 
+  BEFORE PRIVATE
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
     $<BUILD_INTERFACE:${LIBXML2_INCLUDE_DIR}>
diff --git a/src/classes/CMakeLists.txt b/src/classes/CMakeLists.txt
index ae57768e..6d4f952d 100644
--- a/src/classes/CMakeLists.txt
+++ b/src/classes/CMakeLists.txt
@@ -4,19 +4,29 @@
 set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include)
 
 root_generate_dictionary(
-  PFourierCanvasDict ${MUSRFIT_INC}/PFourierCanvas.h LINKDEF ${MUSRFIT_INC}/PFourierCanvasLinkDef.h
+  PFourierCanvasDict 
+  -I${FFTW3_INCLUDE_DIR} ${MUSRFIT_INC}/PFourierCanvas.h 
+  LINKDEF ${MUSRFIT_INC}/PFourierCanvasLinkDef.h
 )
 root_generate_dictionary(
-  PMusrCanvasDict ${MUSRFIT_INC}/PMusrCanvas.h LINKDEF ${MUSRFIT_INC}/PMusrCanvasLinkDef.h
+  PMusrCanvasDict 
+  -I${FFTW3_INCLUDE_DIR} ${MUSRFIT_INC}/PMusrCanvas.h 
+  LINKDEF ${MUSRFIT_INC}/PMusrCanvasLinkDef.h
 )
 root_generate_dictionary(
-  PMusrT0Dict ${MUSRFIT_INC}/PMusrT0.h LINKDEF ${MUSRFIT_INC}/PMusrT0LinkDef.h
+  PMusrT0Dict 
+  -I${FFTW3_INCLUDE_DIR} ${MUSRFIT_INC}/PMusrT0.h 
+  LINKDEF ${MUSRFIT_INC}/PMusrT0LinkDef.h
 )
 root_generate_dictionary(
-  PStartupHandlerDict ${MUSRFIT_INC}/PStartupHandler.h LINKDEF ${MUSRFIT_INC}/PStartupHandlerLinkDef.h
+  PStartupHandlerDict 
+  -I${FFTW3_INCLUDE_DIR} ${MUSRFIT_INC}/PStartupHandler.h 
+  LINKDEF ${MUSRFIT_INC}/PStartupHandlerLinkDef.h
 )
 root_generate_dictionary(
-  PUserFcnBaseDict ${MUSRFIT_INC}/PUserFcnBase.h LINKDEF ${MUSRFIT_INC}/PUserFcnBaseLinkDef.h
+  PUserFcnBaseDict 
+  -I${FFTW3_INCLUDE_DIR} ${MUSRFIT_INC}/PUserFcnBase.h 
+  LINKDEF ${MUSRFIT_INC}/PUserFcnBaseLinkDef.h
 )
 
 #--- create pkg-config info ---------------------------------------------------
@@ -64,7 +74,8 @@ add_library(PMusr SHARED
 )
 #--- make sure that the include directory is found ----------------------------
 target_include_directories(
-  PMusr BEFORE PRIVATE 
+  PMusr BEFORE PRIVATE
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
     $<BUILD_INTERFACE:${NEXUS_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${MUSRFIT_INC}>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/MusrRoot>