Conflicts:
	library/MultiRegions/DisContField2D.cpp
	library/MultiRegions/ExpList.h

Instead, the cmake default way of handling external dependencies is now
recommended:

  FIND_PACKAGE(Nektar++ REQUIRED)
  ADD_DEFINITIONS(${NEKTAR++_DEFINITIONS})
  INCLUDE_DIRECTORIES(${NEKTAR++_INCLUDE_DIRS} ${NEKTAR++_TP_INCLUDE_DIRS})
  LINK_DIRECTORIES(${NEKTAR++_LIBRARY_DIRS} ${NEKTAR++_TP_LIBRARY_DIRS})
  TARGET_LINK_LIBRARIES(${ProjectName} ${NEKTAR++_LIBRARIES} ${NEKTAR++_TP_LIBRARIES})

see templates/executable for an example. The NEKTAR++_TP_XXX variables can be omitted if
the external CMakeLists.txt takes care of findig Nektar++ dependencies itself.

append nektars ThirdParty dir to NEKTAR++_LIBRARY_DIRS and add main.cpp as dummy header file to templates/executable/CMakeLists.txt

Nektar++Config.cmake should only set variables which can be used in the calling
CMakeLists.txt.