Merge branch 'master' of github.com:libigl/libigl

Former-commit-id: a99ed86cc365b0d593c809b55edb627fda970be9

tutorial/403_BoundedBiharmonicWeights/CMakeLists.txt

@@ -8,10 +8,11 @@ if(NOT MOSEK_FOUND)
   if(LIBIGL_USE_STATIC_LIBRARY)
     set(LIBIGLMOSEK_LIBRARY "")
   endif(LIBIGL_USE_STATIC_LIBRARY)
+  set(MOSEK_LIBRARIES "")
+else(NOT MOSEK_FOUND)
+  include_directories( ${MOSEK_INCLUDE_DIR} )
 endif(NOT MOSEK_FOUND)
 
-include_directories( ${MOSEK_INCLUDE_DIR} )
-
 set(SOURCES
 ${PROJECT_SOURCE_DIR}/main.cpp
 )

tutorial/cmake/FindTETGEN.cmake

@@ -6,10 +6,10 @@
 #  TETGEN_SOURCES - the TETGEN source files
 
 FIND_PATH(TETGEN_INCLUDE_DIR tetgen.h
-   /usr/include
-   /usr/local/include
    ${PROJECT_SOURCE_DIR}/../libigl/external/tetgen/
    ${PROJECT_SOURCE_DIR}/../../external/tetgen/
+   /usr/include
+   /usr/local/include
    NO_DEFAULT_PATH
 )