more work towards a modern cmake. As a first example reworked FFTW3 binding.

CMakeLists.txt

@@ -105,12 +105,6 @@ find_package(GSL REQUIRED)
 
 #--- check for fftw3 ----------------------------------------------------------
 find_package(FFTW3 REQUIRED)
-if (FFTW3_THREAD_FOUND)
-  set(HAVE_LIBFFTW3_THREADS 1 CACHE INTERNAL "fftw3_threads are available")
-endif (FFTW3_THREAD_FOUND)
-if (FFTW3F_THREAD_FOUND)
-  set(HAVE_LIBFFTW3F_THREADS 1 CACHE INTERNAL "fftw3f_threads are available")
-endif (FFTW3F_THREAD_FOUND)
 
 #--- check for libxml2 --------------------------------------------------------
 find_package(LibXml2 REQUIRED)
@@ -209,7 +203,7 @@ endif (qt_based_tools)
 if (nexus)
   find_package(HDF5 COMPONENTS CXX REQUIRED )
   find_package(HDF4 REQUIRED)
-  find_package(NeXus REQUIRED)
+  find_package(NEXUS REQUIRED)
   add_definitions(-DPNEXUS_ENABLED)
 endif (nexus)
 
@@ -249,7 +243,7 @@ message("")
 message(" Requirements:")
 message(" -------------")
 message("")
-message(" FFTW3   found in ${FFTW3_INCLUDE_DIR}")
+message(" FFTW3   found in ${FFTW3_INCLUDE}")
 message(" GSL     found in ${GSL_INCLUDE_DIRS}")
 message(" BOOST   found in ${Boost_INCLUDE_DIRS}")
 message(" LibXML2 found in ${LIBXML2_INCLUDE_DIR}")

cmake/FindFFTW3.cmake

@@ -1,7 +1,7 @@
 # - Find fftw3 library
 # Find the native FFTW3 includes and library
 # This module defines
-#  FFTW3_INCLUDE_DIR, where to find fftw3.h, etc.
+#  FFTW3_INCLUDE, where to find fftw3.h, etc.
 # ---
 #  FFTW3_LIBRARY, library to link against to use FFTW3
 #  FFTW3_OMP_LIBRARY, library to link against to use FFTW3_omp
@@ -31,17 +31,53 @@
 #  FFTW3Q_OMP_FOUND, if false, do not try to use OpenMP FFTW3q.
 #  FFTW3Q_THREADS_FOUND, if false, do not try to use threaded FFTW3q.
 
-find_path(FFTW3_INCLUDE_DIR fftw3.h
+function(add_imported_library lib_name library headers)
+  add_library(FFTW3::${lib_name} UNKNOWN IMPORTED)
+  set_target_properties(FFTW3::${lib_name} PROPERTIES
+    IMPORTED_LOCATION ${library}
+    INTERFACE_INCLUDE_DIRECTORIES ${headers}
+  )
+  set(${lib_name}_FOUND 1 CACHE INTERNAL "FFTW3 ${lib_name} found" FORCE)
+  set(${lib_name}_LIBRARY ${library}
+      CACHE STRING "Path to FFTW3::${lib_name} library" FORCE)
+  set(FFTW3_INCLUDE ${headers}
+      CACHE STRING "Path to FFTW3 headers" FORCE)
+  mark_as_advanced(FORCE ${lib_name}_LIBRARY)
+  mark_as_advanced(FORCE FFTW3_INCLUDE)
+endfunction()
+
+#as35 if (FFTW3_LIBRARY AND FFTW3_INCLUDE)
+#as35   add_imported_library(${FFTW3_LIBRARY} ${FFTW3_INCLUDE})
+#as35   if (FFTW3_OMP_LIBRARY AND FFTW3_INCLUDE)
+#as35     add_imported_library(${FFTW3_OMP_LIBRARY} ${FFTW3_INCLUDE})
+#as35   elseif (FFTW3_THREAD_LIBRARY AND FFTW3_INCLUDE)
+#as35     add_imported_library(${FFTW3_THRED_LIBRARY} ${FFTW3_INCLUDE})
+#as35   elseif (FFTW3L_LIBRARY AND FFTW3_INCLUDE)
+#as35     add_imported_library(${FFTW3L_LIBRARY} ${FFTW3_INCLUDE})
+#as35   elseif (FFTW3L_OMP_LIBRARY AND FFTW3_INCLUDE)
+#as35     add_imported_library(${FFTW3L_OMP_LIBRARY} ${FFTW3_INCLUDE})
+#as35   elseif (FFTW3L_THREAD_LIBRARY AND FFTW3_INCLUDE)
+#as35     add_imported_library(${FFTW3L_THRED_LIBRARY} ${FFTW3_INCLUDE})
+#as35   elseif (FFTW3F_LIBRARY AND FFTW3_INCLUDE)
+#as35     add_imported_library(${FFTW3F_LIBRARY} ${FFTW3_INCLUDE})
+#as35   elseif (FFTW3F_OMP_LIBRARY AND FFTW3_INCLUDE)
+#as35     add_imported_library(${FFTW3F_OMP_LIBRARY} ${FFTW3_INCLUDE})
+#as35   elseif (FFTW3F_THREAD_LIBRARY AND FFTW3_INCLUDE)
+#as35     add_imported_library(${FFTW3F_THRED_LIBRARY} ${FFTW3_INCLUDE})
+#as35   elseif (FFTW3Q_LIBRARY AND FFTW3_INCLUDE)
+#as35     add_imported_library(${FFTW3Q_LIBRARY} ${FFTW3_INCLUDE})
+#as35   elseif (FFTW3Q_OMP_LIBRARY AND FFTW3_INCLUDE)
+#as35     add_imported_library(${FFTW3Q_OMP_LIBRARY} ${FFTW3_INCLUDE})
+#as35   elseif (FFTW3Q_THREAD_LIBRARY AND FFTW3_INCLUDE)
+#as35     add_imported_library(${FFTW3Q_THRED_LIBRARY} ${FFTW3_INCLUDE})
+#as35   endif()
+#as35   return()
+#as35 endif()
+
+find_path(FFTW3_INCLUDE NAMES fftw3.h
   HINTS "/usr/include" "/opt/local/include"
 )
 
-# find position of fftw3.h from the end
-string(FIND "${FFTW3_INCLUDE_DIR}" "/fftw3.h" pos REVERSE)
-# truncate the string
-string(SUBSTRING "${FFTW3_INCLUDE_DIR}" 0 ${pos} substr)
-set(FFTW3_INCLUDE_DIR ${substr})
-unset(substr)
-
 find_library(FFTW3_LIBRARY fftw3)
 find_library(FFTW3_OMP_LIBRARY fftw3_omp)
 find_library(FFTW3_THREAD_LIBRARY fftw3_threads)
@@ -58,94 +94,126 @@ find_library(FFTW3Q_THREAD_LIBRARY fftw3q_threads)
 # handle the QUIETLY and REQUIRED arguments and set FFTW3_FOUND to TRUE if
 # all listed variables are TRUE
 include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
+
+# FFTW3
 find_package_handle_standard_args(FFTW3
-                                  REQUIRED_VARS FFTW3_LIBRARY FFTW3_INCLUDE_DIR
+                                  DEFAULT_MSG FFTW3_LIBRARY FFTW3_INCLUDE
-                                  VERSION_VAR "3")
+                                 )
+if (FFTW3_FOUND)
+  add_imported_library("FFTW3" "${FFTW3_LIBRARY}" "${FFTW3_INCLUDE}")
+endif()
+
+# FFTW3_OMP
 find_package_handle_standard_args(FFTW3_OMP
-                                  REQUIRED_VARS FFTW3_OMP_LIBRARY FFTW3_INCLUDE_DIR
+                                  REQUIRED_VARS FFTW3_OMP_LIBRARY FFTW3_INCLUDE
-                                  VERSION_VAR "3")
+                                  HANDLE_COMPONENTS
+                                  NAME_MISMATCHED
+                                 )
+if (FFTW3_OMP_FOUND)
+  add_imported_library("FFTW3_OMP" "${FFTW3_OMP_LIBRARY}" "${FFTW3_INCLUDE}")
+endif()
+
+# FFTW3_THREAD
 find_package_handle_standard_args(FFTW3_THREAD
-                                  REQUIRED_VARS FFTW3_THREAD_LIBRARY FFTW3_INCLUDE_DIR
+                                  REQUIRED_VARS FFTW3_THREAD_LIBRARY FFTW3_INCLUDE
-                                  VERSION_VAR "3")
+                                  HANDLE_COMPONENTS
+                                  NAME_MISMATCHED
+                                 )
+if (FFTW3_THREAD_FOUND)
+  add_imported_library("FFTW3_THREAD" "${FFTW3_THREAD_LIBRARY}" "${FFTW3_INCLUDE}")
+endif()
 
+# FFTW3L
 find_package_handle_standard_args(FFTW3L
-                                  REQUIRED_VARS FFTW3L_LIBRARY FFTW3_INCLUDE_DIR
+                                  REQUIRED_VARS FFTW3L_LIBRARY FFTW3_INCLUDE
-                                  VERSION_VAR "3")
+                                  HANDLE_COMPONENTS
+                                  NAME_MISMATCHED
+                                 )
+if (FFTW3L_FOUND)
+  add_imported_library("FFTW3L" "${FFTW3L_LIBRARY}" "${FFTW3_INCLUDE}")
+endif()
+
+# FFTW3L_OMP
 find_package_handle_standard_args(FFTW3L_OMP
-                                  REQUIRED_VARS FFTW3L_OMP_LIBRARY FFTW3_INCLUDE_DIR
+                                  REQUIRED_VARS FFTW3L_OMP_LIBRARY FFTW3_INCLUDE
-                                  VERSION_VAR "3")
+                                  HANDLE_COMPONENTS
+                                  NAME_MISMATCHED
+                                 )
+if (FFTW3L_OMP_FOUND)
+  add_imported_library("FFTW3L_OMP" "${FFTW3L_OMP_LIBRARY}" "${FFTW3_INCLUDE}")
+endif()
+
+# FFTW3L_THREAD
 find_package_handle_standard_args(FFTW3L_THREAD
-                                  REQUIRED_VARS FFTW3L_THREAD_LIBRARY FFTW3_INCLUDE_DIR
+                                  REQUIRED_VARS FFTW3L_THREAD_LIBRARY FFTW3_INCLUDE
-                                  VERSION_VAR "3")
+                                  HANDLE_COMPONENTS
+                                  NAME_MISMATCHED
+                                 )
+if (FFTW3L_THREAD_FOUND)
+  add_imported_library("FFTW3L_THREAD" "${FFTW3L_THREAD_LIBRARY}" "${FFTW3_INCLUDE}")
+endif()
 
+# FFTW3F
 find_package_handle_standard_args(FFTW3F
-                                  REQUIRED_VARS FFTW3F_LIBRARY FFTW3_INCLUDE_DIR
+                                  REQUIRED_VARS FFTW3F_LIBRARY FFTW3_INCLUDE
-                                  VERSION_VAR "3")
+                                  HANDLE_COMPONENTS
+                                  NAME_MISMATCHED
+                                 )
+if (FFTW3F_FOUND)
+  add_imported_library("FFTW3F" "${FFTW3F_LIBRARY}" "${FFTW3_INCLUDE}")
+endif()
+
+# FFTW3F_OMP
 find_package_handle_standard_args(FFTW3F_OMP
-                                  REQUIRED_VARS FFTW3F_OMP_LIBRARY FFTW3_INCLUDE_DIR
+                                  REQUIRED_VARS FFTW3F_OMP_LIBRARY FFTW3_INCLUDE
-                                  VERSION_VAR "3")
+                                  HANDLE_COMPONENTS
+                                  NAME_MISMATCHED
+                                 )
+if (FFTW3F_OMP_FOUND)
+  add_imported_library("FFTW3F_OMP" "${FFTW3F_OMP_LIBRARY}" "${FFTW3_INCLUDE}")
+endif()
+
+# FFTW3F_THREAD
 find_package_handle_standard_args(FFTW3F_THREAD
-                                  REQUIRED_VARS FFTW3F_THREAD_LIBRARY FFTW3_INCLUDE_DIR
+                                  REQUIRED_VARS FFTW3F_THREAD_LIBRARY FFTW3_INCLUDE
-                                  VERSION_VAR "3")
+                                  HANDLE_COMPONENTS
+                                  NAME_MISMATCHED
+                                 )
+if (FFTW3F_THREAD_FOUND)
+  add_imported_library("FFTW3F_THREAD" "${FFTW3F_THREAD_LIBRARY}" "${FFTW3_INCLUDE}")
+endif()
 
+# FFTW3Q
 find_package_handle_standard_args(FFTW3Q
-                                  REQUIRED_VARS FFTW3Q_LIBRARY FFTW3_INCLUDE_DIR
+                                  REQUIRED_VARS FFTW3Q_LIBRARY FFTW3_INCLUDE
-                                  VERSION_VAR "3")
+                                  HANDLE_COMPONENTS
+                                  NAME_MISMATCHED
+                                 )
+if (FFTW3Q_FOUND)
+  add_imported_library("FFTW3Q" "${FFTW3Q_LIBRARY}" "${FFTW3_INCLUDE}")
+endif()
+
+# FFTW3Q_OMP
 find_package_handle_standard_args(FFTW3Q_OMP
-                                  REQUIRED_VARS FFTW3Q_OMP_LIBRARY FFTW3_INCLUDE_DIR
+                                  REQUIRED_VARS FFTW3Q_OMP_LIBRARY FFTW3_INCLUDE
-                                  VERSION_VAR "3")
+                                  HANDLE_COMPONENTS
+                                  NAME_MISMATCHED
+                                 )
+if (FFTW3Q_OMP_FOUND)
+  add_imported_library("FFTW3Q_OMP" "${FFTW3Q_OMP_LIBRARY}" "${FFTW3_INCLUDE}")
+endif()
+
+# FFTW3Q_THREAD
 find_package_handle_standard_args(FFTW3Q_THREAD
-                                  REQUIRED_VARS FFTW3Q_THREAD_LIBRARY FFTW3_INCLUDE_DIR
+                                  REQUIRED_VARS FFTW3Q_THREAD_LIBRARY FFTW3_INCLUDE
-                                  VERSION_VAR "3")
+                                  HANDLE_COMPONENTS
-
+                                  NAME_MISMATCHED
-if (NOT FFTW3_FOUND)
+                                 )
-  unset(FFTW3_LIBRARY)
+if (FFTW3Q_THREAD_FOUND)
-endif()
+  add_imported_library("FFTW3Q_THREAD" "${FFTW3Q_THREAD_LIBRARY}" "${FFTW3_INCLUDE}")
-if (NOT FFTW3_OMP_FOUND)
-  unset(FFTW3_OMP_LIBRARY)
-endif()
-if (NOT FFTW3_THREAD_FOUND)
-  unset(FFTW3_THREAD_LIBRARY)
 endif()
 
-if (NOT FFTW3L_FOUND)
-  unset(FFTW3L_LIBRARY)
-endif()
-if (NOT FFTW3L_OMP_FOUND)
-  unset(FFTW3L_OMP_LIBRARY)
-endif()
-if (NOT FFTW3L_THREAD_FOUND)
-  unset(FFTW3L_THREAD_LIBRARY)
-endif()
-
-if (NOT FFTW3F_FOUND)
-  unset(FFTW3F_LIBRARY)
-endif()
-if (NOT FFTW3F_OMP_FOUND)
-  unset(FFTW3F_OMP_LIBRARY)
-endif()
-if (NOT FFTW3F_THREAD_FOUND)
-  unset(FFTW3F_THREAD_LIBRARY)
-endif()
-
-if (NOT FFTW3Q_FOUND)
-  unset(FFTW3Q_LIBRARY)
-endif()
-if (NOT FFTW3Q_OMP_FOUND)
-  unset(FFTW3Q_OMP_LIBRARY)
-endif()
-if (NOT FFTW3Q_THREAD_FOUND)
-  unset(FFTW3Q_THREAD_LIBRARY)
-endif()
-
-mark_as_advanced(
-  FFTW3_INCLUDE_DIR 
-  FFTW3_LIBRARY FFTW3_OMP_LIBRARY FFTW3_THREAD_LIBRARY
-  FFTW3L_LIBRARY FFTW3L_OMP_LIBRARY FFTW3L_THREAD_LIBRARY
-  FFTW3F_LIBRARY FFTW3F_OMP_LIBRARY FFTW3F_THREAD_LIBRARY
-  FFTW3Q_LIBRARY FFTW3Q_OMP_LIBRARY FFTW3Q_THREAD_LIBRARY
-)
 
 if (FFTW3_FOUND)
-  message("-- Found FFTW3: ${FFTW3_INCLUDE_DIR}")
+  message("-- Found FFTW3: ${FFTW3_INCLUDE}")
 endif (FFTW3_FOUND)

cmake/FindNEXUS.cmake

@@ -0,0 +1,45 @@
+# - Find NeXus library
+# Find the native NEXUS includes and library
+# This module defines
+#  NEXUS_INCLUDE_DIR, where to find NeXus.h, etc.
+#  NEXUS_LIBRARY, library to link against to use NEXUS
+#  NEXUS_FOUND, if false, do not try to use NEXUS.
+
+find_path(NEXUS_INCLUDE_DIR napi.h
+  HINTS "/usr/local/include" "/opt/nexus/include" "/usr/local/include/nexus"
+)
+# find position of napi.h from the end
+string(FIND "${NEXUS_INCLUDE_DIR}" "/napi.h" pos REVERSE)
+# truncate the string
+string(SUBSTRING "${NEXUS_INCLUDE_DIR}" 0 ${pos} substr)
+set(NEXUS_INCLUDE_DIR ${substr})
+unset(substr)
+
+find_library(NEXUS_LIBRARY NeXus 
+  HINTS "/usr/lib" "/usr/lib64" "/usr/local/lib" "/usr/local/lib64" "/opt/nexus/lib")
+
+# get version string
+if (NEXUS_INCLUDE_DIR AND EXISTS ${NEXUS_INCLUDE_DIR}/napi.h)
+  file(STRINGS "${NEXUS_INCLUDE_DIR}/napi.h" NEXUS_version_str
+       REGEX "^#define[\t ]+NEXUS_VERSION[\t ].*")
+
+  string(REGEX REPLACE "^#define[\t ]+NEXUS_VERSION[\t ]+\"([^\"]*).*"
+         "\\1" NEXUS_VERSION_STRING "${NEXUS_version_str}")
+  unset(NEXUS_version_str)
+endif()
+
+# handle the QUIETLY and REQUIRED arguments and set NEXUS_FOUND to TRUE if
+# all listed variables are TRUE
+include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(NEXUS
+                                  REQUIRED_VARS NEXUS_LIBRARY NEXUS_INCLUDE_DIR
+                                  VERSION_VAR NEXUS_VERSION_STRING)
+
+if (NOT NEXUS_FOUND)
+  unset(NEXUS_LIBRARY)
+endif()
+
+mark_as_advanced(NEXUS_INCLUDE_DIR NEXUS_LIBRARY)
+
+
+

src/CMakeLists.txt

@@ -60,7 +60,6 @@ target_compile_options(addRun BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H
 target_include_directories(addRun 
   BEFORE PRIVATE
     $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
@@ -72,7 +71,6 @@ target_compile_options(any2many BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV
 target_include_directories(any2many 
   BEFORE PRIVATE
     $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
@@ -84,7 +82,6 @@ target_compile_options(dump_header BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_
 target_include_directories(dump_header 
   BEFORE PRIVATE 
     $<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${NEXUS_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
@@ -102,7 +99,6 @@ target_compile_options(msr2data BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV
 target_include_directories(msr2data 
   BEFORE PRIVATE 
     $<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
@@ -117,7 +113,6 @@ target_compile_options(musrfit BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_
 target_include_directories(musrfit 
   BEFORE PRIVATE 
     $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
@@ -129,18 +124,17 @@ target_compile_options(musrFT BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H
 target_include_directories(musrFT 
   BEFORE PRIVATE 
     $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
 )
-target_link_libraries(musrFT  ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
+target_link_libraries(musrFT  FFTW3::FFTW3 ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
 
 add_executable(musrRootValidation ${GIT_REV_H} musrRootValidation.cpp)
 target_compile_options(musrRootValidation BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
 target_include_directories(musrRootValidation 
   BEFORE PRIVATE
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
@@ -153,7 +147,6 @@ target_compile_options(musrt0 BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H
 target_include_directories(musrt0 
   BEFORE PRIVATE 
     $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
@@ -165,18 +158,17 @@ target_compile_options(musrview BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV
 target_include_directories(musrview 
   BEFORE PRIVATE
     $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE}> 
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
 )
-target_link_libraries(musrview  ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
+target_link_libraries(musrview FFTW3::FFTW3 ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
 
 add_executable(write_musrRoot_runHeader ${GIT_REV_H} write_musrRoot_runHeader.cpp)
 target_compile_options(write_musrRoot_runHeader BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
 target_include_directories(write_musrRoot_runHeader 
   BEFORE PRIVATE
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>

src/classes/CMakeLists.txt

@@ -12,7 +12,7 @@ root_generate_dictionary(
   PFourierCanvas.h 
   OPTIONS 
     -I${MUSRFIT_INC} 
-    -I${FFTW3_INCLUDE_DIR}
+    -I${FFTW3_INCLUDE}
     -inlineInputHeader
   LINKDEF ${MUSRFIT_INC}/PFourierCanvasLinkDef.h
   MODULE PFourierCanvas
@@ -22,7 +22,7 @@ root_generate_dictionary(
   PMusrCanvas.h  
   LINKDEF ${MUSRFIT_INC}/PMusrCanvasLinkDef.h
   OPTIONS 
-    -I${Boost_INCLUDE_DIR} -I${FFTW3_INCLUDE_DIR} -I${MUSRFIT_INC}
+    -I${Boost_INCLUDE_DIR} -I${FFTW3_INCLUDE} -I${MUSRFIT_INC}
     -inlineInputHeader
   MODULE PMusrCanvas
 )
@@ -31,7 +31,7 @@ root_generate_dictionary(
   PMusrT0.h
   LINKDEF ${MUSRFIT_INC}/PMusrT0LinkDef.h
   OPTIONS 
-    -I${Boost_INCLUDE_DIR} -I${FFTW3_INCLUDE_DIR} -I${MUSRFIT_INC}
+    -I${Boost_INCLUDE_DIR} -I${FFTW3_INCLUDE} -I${MUSRFIT_INC}
     -inlineInputHeader
   MODULE PMusrT0
 )
@@ -40,7 +40,7 @@ root_generate_dictionary(
   PStartupHandler.h 
   LINKDEF ${MUSRFIT_INC}/PStartupHandlerLinkDef.h
   OPTIONS 
-    -I${FFTW3_INCLUDE_DIR} -I${MUSRFIT_INC}
+    -I${FFTW3_INCLUDE} -I${MUSRFIT_INC}
     -inlineInputHeader
   MODULE PStartupHandler
 )
@@ -50,7 +50,7 @@ root_generate_dictionary(
   LINKDEF ${MUSRFIT_INC}/PUserFcnBaseLinkDef.h
   OPTIONS
     -inlineInputHeader
-    -I${FFTW3_INCLUDE_DIR} -I${MUSRFIT_INC}
+    -I${FFTW3_INCLUDE} -I${MUSRFIT_INC}
   MODULE PUserFcnBase
 )
 root_generate_dictionary(
@@ -59,7 +59,7 @@ root_generate_dictionary(
   OPTIONS 
     -I${NONLOCAL_INC} 
     -I${MUSRFIT_INC}
-    -I${FFTW3_INCLUDE_DIR}
+    -I${FFTW3_INCLUDE}
     -I${CMAKE_CURRENT_SOURCE_DIR}
     -inlineInputHeader
   LINKDEF ${MUSRFIT_INC}/PRgeHandlerLinkDef.h
@@ -118,7 +118,7 @@ add_library(PMusr SHARED
 target_include_directories(
   PMusr BEFORE PRIVATE
     $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE}> 
     $<BUILD_INTERFACE:${NEXUS_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${MUSRFIT_INC}>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/MusrRoot>
@@ -176,7 +176,8 @@ endif (OpenMP_FOUND)
 
 #--- add library dependencies -------------------------------------------------
 set(DependOnLibs ${ROOT_LIBARIES})
-set(DependOnLibs ${DependOnLibs} ${FFTW3_LIBRARY})
+#set(DependOnLibs ${DependOnLibs} ${FFTW3_LIBRARY})
+set(DependOnLibs ${DependOnLibs} FFTW3::FFTW3)
 set(DependOnLibs ${DependOnLibs} PUserFcnBase)
 set(DependOnLibs ${DependOnLibs} mud)
 set(DependOnLibs ${DependOnLibs} TMusrRunHeader)

src/external/BMWtools/CMakeLists.txt

@@ -47,7 +47,6 @@ set_target_properties(BMWtools
 #--- make sure that the include directory is found ----------------------------
 target_include_directories(
   BMWtools BEFORE PRIVATE 
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
     $<BUILD_INTERFACE:${CUBA_INC}>
     $<BUILD_INTERFACE:${MUSRFIT_INC}>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

src/external/DummyUserFcn/src/CMakeLists.txt

@@ -12,7 +12,6 @@ root_generate_dictionary(
   PDummyUserFcnDict 
   PDummyUserFcn.h 
   OPTIONS 
-    -I${FFTW3_INCLUDE_DIR} 
     -I${MUSRFIT_INC}
     -I${DUMMY_USER_FUNC_INC}
     -inlineInputHeader
@@ -44,13 +43,12 @@ set_target_properties(PDummyUserFcn
 #--- make sure that the include directory is found ----------------------------
 target_include_directories(
   PDummyUserFcn BEFORE PRIVATE 
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
     $<BUILD_INTERFACE:${MUSRFIT_INC}>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../inc>
 )
 
 #--- add library dependencies -------------------------------------------------
-target_link_libraries(PDummyUserFcn ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase)
+target_link_libraries(PDummyUserFcn ${ROOT_LIBRARIES} PUserFcnBase)
 
 #--- install PDummyUserFcn solib -------------------------------------------------
 install(TARGETS PDummyUserFcn DESTINATION lib)

src/external/MagProximity/CMakeLists.txt

@@ -7,7 +7,7 @@ root_generate_dictionary(
   PMagProximityFitterDict 
   PMagProximityFitter.h 
   OPTIONS 
-    -I${FFTW3_INCLUDE_DIR}
+    -I${FFTW3_INCLUDE}
     -I${MUSRFIT_INC}
     -I${CMAKE_CURRENT_SOURCE_DIR}
     -inlineInputHeader
@@ -44,7 +44,7 @@ add_library(PMagProximityFitter SHARED
 #--- make sure that the include directory is found ----------------------------
 target_include_directories(
   PMagProximityFitter BEFORE PRIVATE 
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE}> 
     $<BUILD_INTERFACE:${MUSRFIT_INC}>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
@@ -56,7 +56,7 @@ set_target_properties(PMagProximityFitter
 )
 
 #--- add library dependencies -------------------------------------------------
-target_link_libraries(PMagProximityFitter ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} PRgeHandler PUserFcnBase)
+target_link_libraries(PMagProximityFitter FFTW3::FFTW3 ${ROOT_LIBRARIES} PRgeHandler PUserFcnBase)
 
 #--- install PMagProximityFitter solib ----------------------------------------
 install(TARGETS PMagProximityFitter DESTINATION lib)

src/external/Nonlocal/CMakeLists.txt

@@ -14,7 +14,7 @@ root_generate_dictionary(
   PNL_PippardFitterDict 
   PNL_PippardFitter.h 
   OPTIONS
-    -I${FFTW3_INCLUDE_DIR} 
+    -I${FFTW3_INCLUDE} 
     -I${MUSRFIT_INC} 
     -I${NONLOCAL_INC} 
     -I${CMAKE_CURRENT_SOURCE_DIR}
@@ -52,7 +52,7 @@ add_library(PNL_PippardFitter SHARED
 #--- make sure that the include directory is found ----------------------------
 target_include_directories(
   PNL_PippardFitter BEFORE PRIVATE 
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE}> 
     $<BUILD_INTERFACE:${MUSRFIT_INC}>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
 )
@@ -64,7 +64,7 @@ set_target_properties(PNL_PippardFitter
 )
 
 #--- add library dependencies -------------------------------------------------
-target_link_libraries(PNL_PippardFitter ${Boost_LIBRARIES} ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} PRgeHandler PUserFcnBase)
+target_link_libraries(PNL_PippardFitter ${Boost_LIBRARIES} FFTW3::FFTW3 ${ROOT_LIBRARIES} PRgeHandler PUserFcnBase)
 
 #--- install PNL_PippardFitter solib ------------------------------------------
 install(TARGETS PNL_PippardFitter DESTINATION lib)

src/external/libBNMR/CMakeLists.txt

@@ -14,7 +14,6 @@ root_generate_dictionary(
   TBNMRDict 
   TBNMR.h 
   OPTIONS 
-    -I${FFTW3_INCLUDE_DIR} 
     -I${MUSRFIT_INC}
     -inlineInputHeader
   LINKDEF TBNMRLinkDef.h

src/external/libBNMR/libLineProfile/CMakeLists.txt

@@ -11,7 +11,7 @@ root_generate_dictionary(
   LineProfileDict 
   LineProfile.h 
   OPTIONS
-    -I${FFTW3_INCLUDE_DIR} 
+    -I${FFTW3_INCLUDE} 
     -I${MUSRFIT_INC}
   LINKDEF LineProfileLinkDef.h
   MODULE LineProfile

src/external/libCalcMeanFieldsLEM/CMakeLists.txt

@@ -13,7 +13,7 @@ root_generate_dictionary(
   TCalcMeanFieldsLEMDict 
   TCalcMeanFieldsLEM.h
   OPTIONS 
-    -I${FFTW3_INCLUDE_DIR} 
+    -I${FFTW3_INCLUDE} 
     -I${MUSRFIT_INC} 
     -I${BMW_TOOLS_INC} 
     -I${POFB_INC}
@@ -48,7 +48,7 @@ set_target_properties(CalcMeanFieldsLEM
 #--- make sure that the include directory is found ----------------------------
 target_include_directories(
   CalcMeanFieldsLEM BEFORE PRIVATE 
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE}> 
     $<BUILD_INTERFACE:${MUSRFIT_INC}>
     $<BUILD_INTERFACE:${BMW_TOOLS_INC}>
     $<BUILD_INTERFACE:${POFB_INC}>
@@ -57,7 +57,7 @@ target_include_directories(
 
 #--- add library dependencies -------------------------------------------------
 target_link_libraries(CalcMeanFieldsLEM 
-  ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} BMWtools FitPofB PUserFcnBase
+  FFTW3::FFTW3 ${ROOT_LIBRARIES} BMWtools FitPofB PUserFcnBase
 )
 
 #--- install CalcMeanFieldsLEM solib ------------------------------------------

src/external/libFitPofB/classes/CMakeLists.txt

@@ -13,7 +13,7 @@ root_generate_dictionary(
   TLondon1DDict 
   TLondon1D.h 
   OPTIONS
-    -I${FFTW3_INCLUDE_DIR} 
+    -I${FFTW3_INCLUDE} 
     -I${MUSRFIT_INC}
     -I${BMW_TOOLS_INC}
     -I${FIT_P_OF_B_INC}
@@ -25,7 +25,7 @@ root_generate_dictionary(
   TVortexDict 
   TVortex.h 
   OPTIONS 
-    -I${FFTW3_INCLUDE_DIR} 
+    -I${FFTW3_INCLUDE} 
     -I${MUSRFIT_INC}
     -I${BMW_TOOLS_INC}
     -I${FIT_P_OF_B_INC}
@@ -37,7 +37,7 @@ root_generate_dictionary(
   TSkewedGssDict 
   TSkewedGss.h 
   OPTIONS 
-    -I${FFTW3_INCLUDE_DIR} 
+    -I${FFTW3_INCLUDE} 
     -I${MUSRFIT_INC}
     -I${BMW_TOOLS_INC}
     -I${POFB_INC}
@@ -82,7 +82,7 @@ set_target_properties(FitPofB
 #--- make sure that the include directory is found ----------------------------
 target_include_directories(
   FitPofB BEFORE PRIVATE 
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE}> 
     $<BUILD_INTERFACE:${MUSRFIT_INC}>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/TLemRunHeader>
     $<BUILD_INTERFACE:${BMW_TOOLS_INC}>
@@ -101,7 +101,7 @@ if (OpenMP_FOUND AND (${CMAKE_HOST_SYSTEM_NAME} STREQUAL Linux))
 endif (OpenMP_FOUND AND (${CMAKE_HOST_SYSTEM_NAME} STREQUAL Linux))
 target_link_libraries(FitPofB 
     ${gomp}
-    ${FFTW3_LIBRARY} ${FFTW3F_LIBRARY} ${ROOT_LIBRARIES} 
+    FFTW3::FFTW3 FFTW3::FFTW3F ${ROOT_LIBRARIES} 
     TLemRunHeader PUserFcnBase BMWtools
 )
 

src/external/libGapIntegrals/CMakeLists.txt

@@ -12,7 +12,7 @@ root_generate_dictionary(
   TGapIntegralsDict 
   TGapIntegrals.h
   OPTIONS 
-    -I${FFTW3_INCLUDE_DIR} 
+    -I${FFTW3_INCLUDE} 
     -I${MUSRFIT_INC}
     -I${BMW_TOOLS_INC}
     -I${CMAKE_CURRENT_SOURCE_DIR}
@@ -47,7 +47,7 @@ set_target_properties(GapIntegrals
 #--- make sure that the include directory is found ----------------------------
 target_include_directories(
   GapIntegrals BEFORE PRIVATE 
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE}> 
     $<BUILD_INTERFACE:${MUSRFIT_INC}>
     $<BUILD_INTERFACE:${BMW_TOOLS_INC}>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
@@ -55,7 +55,7 @@ target_include_directories(
 
 #--- add library dependencies -------------------------------------------------
 target_link_libraries(GapIntegrals 
-  ${GSL_LIBRARIES} ${FFTW3F_LIBRARY} ${ROOT_LIBRARIES} 
+  ${GSL_LIBRARIES} FFTW3::FFTW3F ${ROOT_LIBRARIES} 
   PUserFcnBase cuba BMWtools
 )
 

src/external/libGbGLF/CMakeLists.txt

@@ -31,7 +31,7 @@ add_library(PGbGLF SHARED
 #--- make sure that the include directory is found ----------------------------
 target_include_directories(
   PGbGLF BEFORE PRIVATE 
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE}> 
     $<BUILD_INTERFACE:${MUSRFIT_INC}>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
 )
@@ -43,7 +43,7 @@ set_target_properties(PGbGLF
 )
 
 #--- add library dependencies -------------------------------------------------
-target_link_libraries(PGbGLF ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase)
+target_link_libraries(PGbGLF FFTW3::FFTW3 ${ROOT_LIBRARIES} PUserFcnBase)
 
 #--- install PGbGLF solib -----------------------------------------------------
 install(TARGETS PGbGLF DESTINATION lib)

src/external/libLFRelaxation/CMakeLists.txt

@@ -12,7 +12,7 @@ root_generate_dictionary(
   TLFRelaxationDict 
   TLFRelaxation.h
   OPTIONS 
-    -I${FFTW3_INCLUDE_DIR} 
+    -I${FFTW3_INCLUDE} 
     -I${MUSRFIT_INC}
     -I${BMW_TOOLS_INC}
     -inlineInputHeader
@@ -46,7 +46,7 @@ set_target_properties(LFRelaxation
 #--- make sure that the include directory is found ----------------------------
 target_include_directories(
   LFRelaxation BEFORE PRIVATE 
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE}> 
     $<BUILD_INTERFACE:${MUSRFIT_INC}>
     $<BUILD_INTERFACE:${BMW_TOOLS_INC}>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
@@ -63,7 +63,7 @@ if (OpenMP_FOUND AND (${CMAKE_HOST_SYSTEM_NAME} STREQUAL Linux))
 endif (OpenMP_FOUND AND (${CMAKE_HOST_SYSTEM_NAME} STREQUAL Linux))
 target_link_libraries(LFRelaxation 
    ${gomp}
-   ${GSL_LIBRARIES} ${FFTW3F_LIBRARY} 
+   ${GSL_LIBRARIES} FFTW3::FFTW3F
    ${ROOT_LIBRARIES} PUserFcnBase cuba BMWtools
 )
 

src/external/libPhotoMeissner/classes/CMakeLists.txt

@@ -12,7 +12,7 @@ root_generate_dictionary(
   PPhotoMeissnerDict
   PPhotoMeissner.h 
   OPTIONS 
-    -I${FFTW3_INCLUDE_DIR} 
+    -I${FFTW3_INCLUDE} 
     -I${GSL_INCLUDE_DIRS} 
     -I${ROOT_INCLUDE_DIRS}
     -I${MUSRFIT_INC}
@@ -46,7 +46,7 @@ set_target_properties(PPhotoMeissner
 #--- make sure that the include directory is found ----------------------------
 target_include_directories(
   PPhotoMeissner BEFORE PRIVATE
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE}> 
     $<BUILD_INTERFACE:${GSL_INCLUDE_DIRS}> 
     $<BUILD_INTERFACE:${ROOT_INCLUDE_DIRS}> 
     $<BUILD_INTERFACE:${MUSRFIT_INC}>
@@ -55,7 +55,7 @@ target_include_directories(
 
 #--- add library dependencies -------------------------------------------------
 target_link_libraries(PPhotoMeissner 
-   ${FFTW3_LIBRARY} ${GSL_LIBRARY} ${ROOT_LIBRARIES} PRgeHandler PUserFcnBase
+   FFTW3::FFTW3 ${GSL_LIBRARY} ${ROOT_LIBRARIES} PRgeHandler PUserFcnBase
 )
 
 #--- install PPhotoMeissner solib ---------------------------------------------

src/external/libSpinValve/classes/CMakeLists.txt

@@ -12,7 +12,7 @@ root_generate_dictionary(
   PSkewedLorentzianDict 
   PSkewedLorentzian.h 
   OPTIONS 
-    -I${FFTW3_INCLUDE_DIR} 
+    -I${FFTW3_INCLUDE} 
     -I${MUSRFIT_INC}
     -I${SPIN_VALVE_INC}
     -inlineInputHeader
@@ -55,13 +55,13 @@ set_target_properties(PSpinValve
 #--- make sure that the include directory is found ----------------------------
 target_include_directories(
   PSpinValve BEFORE PRIVATE 
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE}> 
     $<BUILD_INTERFACE:${MUSRFIT_INC}>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
 )
 
 #--- add library dependencies -------------------------------------------------
-target_link_libraries(PSpinValve ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase)
+target_link_libraries(PSpinValve FFTW3::FFTW3 ${ROOT_LIBRARIES} PUserFcnBase)
 
 #--- install PSpinValve solib -------------------------------------------------
 install(TARGETS PSpinValve DESTINATION lib)

src/external/libZFRelaxation/CMakeLists.txt

@@ -12,7 +12,7 @@ root_generate_dictionary(
   ZFRelaxationDict 
   ZFRelaxation.h
   OPTIONS 
-    -I${FFTW3_INCLUDE_DIR} 
+    -I${FFTW3_INCLUDE} 
     -I${MUSRFIT_INC}
     -I${BMW_TOOLS_INC}
     -inlineInputHeader
@@ -46,7 +46,7 @@ set_target_properties(ZFRelaxation
 #--- make sure that the include directory is found ----------------------------
 target_include_directories(
   ZFRelaxation BEFORE PRIVATE 
-    $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
+    $<BUILD_INTERFACE:${FFTW3_INCLUDE}> 
     $<BUILD_INTERFACE:${MUSRFIT_INC}>
     $<BUILD_INTERFACE:${BMW_TOOLS_INC}>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
@@ -62,7 +62,7 @@ if (OpenMP_FOUND AND (${CMAKE_HOST_SYSTEM_NAME} STREQUAL Linux))
   set(gomp gomp)
 endif (OpenMP_FOUND AND (${CMAKE_HOST_SYSTEM_NAME} STREQUAL Linux))
 target_link_libraries(ZFRelaxation 
-  ${gomp} ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase cuba BMWtools
+  ${gomp} FFTW3::FFTW3 ${ROOT_LIBRARIES} PUserFcnBase cuba BMWtools
 ) 
 
 #--- install ZFRelaxation solib -----------------------------------------------