• Diff
  • added Diff r2
• Description

  Changed from:

  This patch has only effect on standalone.
  It searches for the Qt libs using the cmake provided FindQt4.cmake.
  
  I added an explicit test to check if QTDIR is set, it is set to
  the correct value (even LL got this wrong on their wiki, so it's
  apparently not obvious): As of Qt 4, Qt is found by calling qmake,
  NOT by looking at QTDIR. So, if you set QTDIR then it better be
  set to whatever qmake was "found" (using PATH as usual).
  
  While FindLLQtWebkit.cmake was added to the repository, it wasn't
  used for some reason... but it works perfectly. This patch uses it
  to find LLQtWebkit and then uses the resulting LLQTWEBKIT_LIBRARY
  and LLQTWEBKIT_INCLUDE_DIR in the right places.
  
  Finally, we also need to explicitly pass the Qt plugin libraries
  in order to link with them, so part of this patch adds the rules
  to do that (the foreach).
  

  Changed to:

  This patch has only effect on standalone.
  It searches for the Qt libs using the cmake provided FindQt4.cmake
  and search for llqtwekbit using the new FindLLQtWebkit.cmake
  and then uses the resulting LLQTWEBKIT_LIBRARY
  and LLQTWEBKIT_INCLUDE_DIR in the right places.
  
  I added an explicit test to check if QTDIR is set, it is set to
  the correct value (even LL got this wrong on their wiki, so it's
  apparently not obvious): As of Qt 4, Qt is found by calling qmake,
  NOT by looking at QTDIR. So, if you set QTDIR then it better be
  set to whatever qmake was "found" (using PATH as usual).
  
  Finally, we also need to explicitly pass the Qt plugin libraries
  in order to link with them, so part of this patch adds the rules
  to do that (the foreach).
  
  Note that if you installed your libs in a non-standard place, then
  of course you still have to set LD_LIBRARY_PATH yourself before
  running the viewer ;)

The new version is the same as the previous one, but it adds indra/cmake/FindLLQtWebkit.cmake that was erroneously missing in the previous patch.