Преглед на файлове

small fixes

Former-commit-id: 4544bd570c8b4c340779724f9a7ddfb9a262c6e3
Daniele Panozzo преди 10 години
родител
ревизия
ba94f1695b
променени са 2 файла, в които са добавени 18 реда и са изтрити 12 реда
  1. 3 0
      tutorial/cmake/FindEIGEN.cmake
  2. 15 12
      tutorial/cmake/FindYIMG.cmake

+ 3 - 0
tutorial/cmake/FindEIGEN.cmake

@@ -69,6 +69,9 @@ else ()
     ${PROJECT_SOURCE_DIR}/../../../external/nanogui/ext/eigen/
     ${PROJECT_SOURCE_DIR}/../../external/nanogui/ext/eigen/
     ${PROJECT_SOURCE_DIR}/../external/nanogui/ext/eigen/
+    ${PROJECT_SOURCE_DIR}/../libigl/external/nanogui/ext/eigen/
+    ${PROJECT_SOURCE_DIR}/../../libigl/external/nanogui/ext/eigen/
+    ${PROJECT_SOURCE_DIR}/../../../libigl/external/nanogui/ext/eigen/
 	  $ENV{DevLibraries}/Eigen
       PATH_SUFFIXES eigen3 eigen
     )

+ 15 - 12
tutorial/cmake/FindYIMG.cmake

@@ -3,30 +3,33 @@
 #
 #  YIMG_FOUND - system has YIMG
 #  YIMG_INCLUDE_DIR - the YIMG include directory
-#  YIMG_LIBRARIES - the YIMG libraries
+#  YIMG_SOURCES - the YIMG source files
 
 FIND_PATH(YIMG_INCLUDE_DIR YImage.hpp
    /usr/include
    /usr/local/include
    /opt/local/include
    $ENV{LIBIGL}/external/yimg
+   ../external/yimg/
+   ../../external/yimg/
+   ../../external/yimg/
+   ../libigl/external/yimg/
+   ../../libigl/external/yimg/
+   ../../../libigl/external/yimg/
+
 )
 
-set(YIMG_LIB_DIRS
-   /usr/include
-   /usr/local/include
-   /opt/local/include
-   $ENV{LIBIGL}/external/yimg)
-FIND_LIBRARY( YIMG_LIBRARIES NAMES yimg PATHS ${YIMG_LIB_DIRS})
+set(YIMG_SOURCES
+${YIMG_INCLUDE_DIR}/YImage.cpp)
 
-if(YIMG_INCLUDE_DIR AND YIMG_LIBRARIES)
+if(YIMG_INCLUDE_DIR)
    message(STATUS "Found YIMG: ${YIMG_INCLUDE_DIR}")
    set(YIMG_FOUND "YES")
 else()
-   message(WARNING "could NOT find YIMG")
-   set(YIMG_FOUND "NO")
+  set(YIMG_FOUND "NO")
+  if (NOT YIMG_FIND_QUIETLY)
+      message(FATAL_ERROR "could NOT find YIMG")
+  endif (NOT YIMG_FIND_QUIETLY)
 endif()
 
 MARK_AS_ADVANCED(YIMG_INCLUDE_DIR YIMG_LIBRARIES)
-
-