Merge branch 'fix/remove-include_directories' into 'master'

Fix/remove include directories

See merge request !26

cmake/modules/DuneUggridMacros.cmake

@@ -24,8 +24,8 @@ else()
 endif()
 
 # Check whether dune-uggrid is installed
-if(NOT dune-uggrid_INSTALLED)
-  #Yes, then we have setup the complete include path to the ug headers.
+# to work around includes not relative to dune-uggrid's root directory
+if((NOT dune-uggrid_INSTALLED) AND (NOT PROJECT_NAME STREQUAL dune-uggrid))
   include_directories(${dune-uggrid_PREFIX} ${dune-uggrid_PREFIX}/low
     ${dune-uggrid_PREFIX}/gm ${dune-uggrid_PREFIX}/dev ${dune-uggrid_PREFIX}/dom
     ${dune-uggrid_PREFIX}/np ${dune-uggrid_PREFIX}/ui
@@ -35,4 +35,4 @@ if(NOT dune-uggrid_INSTALLED)
     ${dune-uggrid_PREFIX}/parallel/ppif
     ${dune-uggrid_PREFIX}/parallel/dddif ${dune-uggrid_PREFIX}/parallel/util
     ${dune-uggrid_PREFIX}/parallel/ddd/include )
-endif(NOT dune-uggrid_INSTALLED)
+endif()