Эх сурвалжийг харах

fix compilation errors on clang + yosemite
example 403 is now skipped if mosek is not found


Former-commit-id: 852065e3128a8ca43643981badaa9f03e1330948

Daniele Panozzo 10 жил өмнө
parent
commit
a22e3ed7ca

+ 1 - 1
build/Makefile.conf

@@ -107,7 +107,7 @@ endif
 ifeq ($(IGL_USERNAME),daniele)
 	IGL_WITH_MATLAB=0
 	AFLAGS=-m64
-	GG=g++-4.7
+	GG=g++
 	EIGEN3_INC=-I/usr/local/include/eigen3
 endif
 

+ 2 - 1
include/igl/peal_outer_hull_layers.cpp

@@ -1,5 +1,6 @@
 #include "peal_outer_hull_layers.h"
 #include "outer_hull.h"
+#include <vector>
 
 template <
   typename DerivedV,
@@ -40,7 +41,7 @@ IGL_INLINE void igl::peal_outer_hull_layers(
     outer_hull(V,Fr,Fo,Jo,flipr);
     assert(Fo.rows() == Jo.rows());
     // all faces in Fo of Fr
-    vector<bool> in_outer(Fr.rows(),false); 
+    vector<bool> in_outer(Fr.rows(),false);
     for(Index g = 0;g<Jo.rows();g++)
     {
       odd(IM(Jo(g))) = odd_iter;

+ 5 - 0
tutorial/CMakeLists.txt

@@ -14,6 +14,9 @@ find_package(MATLAB QUIET)
 find_package(EMBREE QUIET)
 find_package(CGAL QUIET)
 
+## Check for mosek
+find_package(MOSEK QUIET)
+
 # Chapter 1
 add_subdirectory("101_FileIO")
 add_subdirectory("102_DrawMesh")
@@ -38,7 +41,9 @@ add_subdirectory("305_QuadraticProgramming")
 # Chapter 4
 add_subdirectory("401_BiharmonicDeformation")
 add_subdirectory("402_PolyharmonicDeformation")
+if(MOSEK_FOUND)
 add_subdirectory("403_BoundedBiharmonicWeights")
+endif(MOSEK_FOUND)
 add_subdirectory("404_DualQuaternionSkinning")
 add_subdirectory("405_AsRigidAsPossible")
 add_subdirectory("406_FastAutomaticSkinningTransformations")

+ 1 - 2
tutorial/cmake/FindMOSEK.cmake

@@ -26,6 +26,5 @@ IF (MOSEK_FOUND)
    SET(MOSEK_INCLUDE_DIRS ${MOSEK_INCLUDE_DIR} )
 ELSE (MOSEK_FOUND)
     #add_definitions(-DIGL_NO_MOSEK)
-    message(WARNING "could NOT find MOSEK")
+    #message(WARNING "could NOT find MOSEK")
 ENDIF (MOSEK_FOUND)
-