better cmake

Former-commit-id: d3baf8802f4c4831504677fe0978e685e1c727bf

tutorial/CMakeLists.shared

@@ -45,7 +45,7 @@ if(NOT APPLE)
 endif(NOT APPLE)
 
 include_directories( ${EIGEN_INCLUDE_DIR})
-include_directories( ${LIBIGL_INCLUDE_DIR})
+include_directories( ${LIBIGL_INCLUDE_DIRS})
 include_directories( ${GLFW_INCLUDE_DIR})
 include_directories(
 	/usr/local/include

tutorial/cmake/FindLIBIGL.cmake

@@ -2,7 +2,8 @@
 # Once done this will define
 #
 #  LIBIGL_FOUND - system has LIBIGL
-#  LIBIGL_INCLUDE_DIR - the LIBIGL include directory
+#  LIBIGL_INCLUDE_DIR - **the** LIBIGL include directory
+#  LIBIGL_INCLUDE_DIRS - LIBIGL include directories
 #  LIBIGL_SOURCES - the LIBIGL source files
 if(NOT LIBIGL_FOUND)
 
@@ -22,7 +23,7 @@ FIND_PATH(LIBIGL_INCLUDE_DIR igl/readOBJ.h
 
 if(LIBIGL_INCLUDE_DIR)
    set(LIBIGL_FOUND TRUE)
-   set(LIBIGL_INCLUDE_DIR ${LIBIGL_INCLUDE_DIR}  ${LIBIGL_INCLUDE_DIR}/../external/Singular_Value_Decomposition)
+   set(LIBIGL_INCLUDE_DIRS ${LIBIGL_INCLUDE_DIR}  ${LIBIGL_INCLUDE_DIR}/../external/Singular_Value_Decomposition)
    #set(LIBIGL_SOURCES
    #   ${LIBIGL_INCLUDE_DIR}/igl/viewer/Viewer.cpp
    #)
@@ -33,6 +34,7 @@ if(LIBIGL_USE_STATIC_LIBRARY)
   set(LIBIGL_LIB_DIRS
    /usr/lib
    /usr/local/lib
+   $ENV{LIBIGL}/lib
    $ENV{LIBIGLROOT}/lib
    $ENV{LIBIGL_ROOT}/lib
    $ENV{LIBIGL_DIR}/lib
@@ -59,7 +61,7 @@ if(LIBIGL_USE_STATIC_LIBRARY)
 #  endif(NOT LIBIGLMOSEK_LIBRARY)
   set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES}  ${LIBIGLMOSEK_LIBRARY})
 #if(MOSEK_FOUND)
-#    set(LIBIGL_INCLUDE_DIR ${LIBIGL_INCLUDE_DIR}  ${MOSEK_INCLUDE_DIR})
+#    set(LIBIGL_INCLUDE_DIRS ${LIBIGL_INCLUDE_DIRS}  ${MOSEK_INCLUDE_DIR})
 #    set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES}  ${MOSEK_LIBRARIES})
 #  else(MOSEK_FOUND)
 #    set(LIBIGL_FOUND FALSE)
@@ -103,7 +105,7 @@ if(LIBIGL_USE_STATIC_LIBRARY)
   set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES}  ${LIBIGLMATLAB_LIBRARY})
   find_package(Matlab REQUIRED)
   if(MATLAB_FOUND)
-    set(LIBIGL_INCLUDE_DIR ${LIBIGL_INCLUDE_DIR}  ${MATLAB_INCLUDE_DIR})
+    set(LIBIGL_INCLUDE_DIRS ${LIBIGL_INCLUDE_DIRS}  ${MATLAB_INCLUDE_DIR})
     set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES}  ${MATLAB_LIBRARIES})
   else(MATLAB_FOUND)
     set(LIBIGL_FOUND FALSE)
@@ -167,6 +169,6 @@ else(LIBIGL_FOUND)
    endif(LIBIGL_FIND_REQUIRED)
 endif(LIBIGL_FOUND)
 
-MARK_AS_ADVANCED(LIBIGL_INCLUDE_DIR LIBIGL_LIBRARIES IGL_VIEWER_SOURCES)
+MARK_AS_ADVANCED(LIBIGL_INCLUDE_DIRS LIBIGL_INCLUDE_DIR LIBIGL_LIBRARIES IGL_VIEWER_SOURCES)
 
 endif(NOT LIBIGL_FOUND)