qmake build from separate directory, fixes in cmake search for installed software

App/App.pro

@@ -171,7 +171,7 @@ DEPENDPATH  += $$PWD/../Fit/Factory/inc
 # generate ROOT dictionaries
 # -----------------------------------------------------------------------------
 BORNAGAIN_ROOT_DICT_FOR_CLASSES =  inc/App.h inc/AppLinkDef.h
-BORNAGAIN_ROOT_DICT_INCLUDES = ../Core/Tools/inc
+BORNAGAIN_ROOT_DICT_INCLUDES = $$PWD/../Core/Tools/inc
 
 # -----------------------------------------------------------------------------
 # general project settings

Doc/UserManual/UserManual.tex

@@ -157,7 +157,7 @@ keepaspectratio]{results2_2.png}%
 %\chapter{Working with BornAgain}
 \input{Introduction}
 \input{QuickStart}
-%\input{SoftwareArchitecture}
+\input{SoftwareArchitecture}
 %\input{Installation}
 %\input{Fitting}
 %\input{Examples}

cmake/modules/FindFFTW.cmake

@@ -17,7 +17,7 @@ find_path(FFTW_INCLUDE_DIR fftw3.h
   /usr/local/include
   /usr/include
   /opt/fftw3/include
-  HINTS /opt/local/include
+  /opt/local/include
   DOC "Specify the directory containing fftw3.h"
 )
 
@@ -39,6 +39,14 @@ if(FFTW_INCLUDE_DIR AND FFTW_LIBRARY)
   endif()
 endif()
 
+
+if( NOT FFTW_FOUND )
+    if( FFTW_FIND_REQUIRED )
+        message( FATAL_ERROR "FindFFTW: can't find fftw3 header or library" )
+    endif()
+endif()
+
+
 set(FFTW_LIBRARIES ${FFTW_LIBRARY})
 
 mark_as_advanced(FFTW_FOUND FFTW_LIBRARY FFTW_INCLUDE_DIR)

cmake/modules/FindROOT.cmake

@@ -78,7 +78,9 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
   get_directory_property(incdirs INCLUDE_DIRECTORIES)
   set(includedirs) 
   foreach( d ${incdirs})    
+   if(NOT ${d} STREQUAL "/usr/include")
    set(includedirs ${includedirs} -I${d})
+   endif()
   endforeach()
   #---Get LinkDef.h file------------------------------------
   set(linkdefs)

cmake/modules/SearchInstalledSoftware.cmake

@@ -8,8 +8,8 @@ endif()
 include_directories(${EIGEN3_INCLUDE_DIR})
 
 # --- FFTW3 ---
-find_package(FFTW)
-include_directories(${FFTW_INCLUDE_DIR} REQUIRED)
+find_package(FFTW REQUIRED)
+include_directories(${FFTW_INCLUDE_DIR})
 
 # --- Boost ---
 set(Boost_USE_STATIC_LIBS OFF)