Browse Source

corrected calls to HalfIterator in miq, some cmake stuff

Former-commit-id: 139b2d39429a00b512e1b5672ffe877d3e99b5f2
Olga Diamanti 10 years ago
parent
commit
7df0e77dbb

+ 3 - 0
.gitignore

@@ -70,3 +70,6 @@ external/glfw/build
 tutorial/build*
 tutorial/*/*.mexmaci64
 external/libpng/build
+external/tinyxml2/build
+optional/build
+lib

+ 1 - 1
include/igl/comiso/miq.cpp.REMOVED.git-id

@@ -1 +1 @@
-53de49ce1ce4a0b841b852e3e973c71387a7bcae
+b8c177f12c7c718591018aa69a0fa939242647b1

+ 1 - 0
tutorial/cmake/FindSVD3X3.cmake

@@ -9,6 +9,7 @@ FIND_PATH(SVD3X3_INCLUDE_DIR Singular_Value_Decomposition_Givens_QR_Factorizatio
    /usr/local/include
    ${PROJECT_SOURCE_DIR}/../libigl/external/Singular_Value_Decomposition/
    ${PROJECT_SOURCE_DIR}/../../external/Singular_Value_Decomposition/
+   ${PROJECT_SOURCE_DIR}/../external/Singular_Value_Decomposition/
    NO_DEFAULT_PATH
 )
 

+ 4 - 3
tutorial/cmake/FindYIMG.cmake

@@ -10,13 +10,16 @@ FIND_PATH(YIMG_INCLUDE_DIR YImage.hpp
    /usr/local/include
    /opt/local/include
    $ENV{LIBIGL}/external/yimg
+   ${PROJECT_SOURCE_DIR}/../external/yimg/
 )
 
 set(YIMG_LIB_DIRS
    /usr/include
    /usr/local/include
    /opt/local/include
-   $ENV{LIBIGL}/external/yimg)
+   $ENV{LIBIGL}/external/yimg
+   ${PROJECT_SOURCE_DIR}/../external/yimg/
+   )
 FIND_LIBRARY( YIMG_LIBRARIES NAMES yimg PATHS ${YIMG_LIB_DIRS})
 
 if(YIMG_INCLUDE_DIR AND YIMG_LIBRARIES)
@@ -28,5 +31,3 @@ else()
 endif()
 
 MARK_AS_ADVANCED(YIMG_INCLUDE_DIR YIMG_LIBRARIES)
-
-