- fixed cmake file for MIQ

- NOTE: All the MIQ files need proper documentation and copyright at the top. Will be done in the next few days


Former-commit-id: 3378476f04754bb3f06483dfb04029b230277c88

include/igl/comiso/mixed_integer_quadrangulate.h

@@ -1,6 +1,6 @@
 #ifndef IGL_MIXED_INTEGER_QUADRANGULATE_H
 #define IGL_MIXED_INTEGER_QUADRANGULATE_H
-#include "igl_inline.h"
+#include <igl/igl_inline.h>
 #include <Eigen/Core>
 #include <vector>
 
@@ -10,7 +10,7 @@ namespace igl
   // per face, using the algorithm described in the paper
   // "Mixed-Integer Quadrangulation" by D. Bommes, H. Zimmer, L. Kobbelt
   // ACM SIGGRAPH 2009, Article No. 77 (http://dl.acm.org/citation.cfm?id=1531383)
-  
+
   // Inputs:
   //   Vin        #V by 3 eigen Matrix of mesh vertex 3D positions
   //   F          #F by 4 eigen Matrix of face (quad) indices
@@ -19,7 +19,7 @@ namespace igl
   // Output:
   //   Vout       #V by 3 eigen Matrix of planar mesh vertex 3D positions
   //
-  
+
   template <typename DerivedV, typename DerivedF, typename DerivedU>
   IGL_INLINE void mixed_integer_quadrangulate(const Eigen::PlainObjectBase<DerivedV> &V,
                                               const Eigen::PlainObjectBase<DerivedF> &F,

tutorial/505_NRosyDesign/CMakeLists.txt → tutorial/504_NRosyDesign/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.6)
-project(505_NRoSyDesign)
+project(504_NRoSyDesign)
 
 include("../CMakeLists.shared")
 

tutorial/505_MIQ/CMakeLists.txt

@@ -1,15 +1,15 @@
 cmake_minimum_required(VERSION 2.6)
-project(XXX_MIQ)
+project(505_MIQ)
 
 include("../CMakeLists.shared")
-include_directories("/Users/olkido/Documents/igl/MIQ/src/CoMISo/Solver")
-include_directories("/Users/olkido/Documents/igl/MIQ/src/CoMISo/gmm/include")
-include_directories("/Users/olkido/Documents/igl/MIQ/src")
+
+find_package(LIBCOMISO REQUIRED)
+
+include_directories( ${LIBCOMISO_INCLUDE_DIR} )
+
 set(SOURCES
 ${PROJECT_SOURCE_DIR}/main.cpp
 )
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DINCLUDE_TEMPLATES")
-
-add_executable(XXX_MIQ ${SOURCES} ${SHARED_SOURCES})
-target_link_libraries(XXX_MIQ ${SHARED_LIBRARIES} "/Users/olkido/Documents/igl/MIQ/src/CoMISo/build/libCoMISo.dylib")
+add_executable(${CMAKE_PROJECT_NAME} ${SOURCES} ${SHARED_SOURCES})
+target_link_libraries(${CMAKE_PROJECT_NAME} ${SHARED_LIBRARIES} ${LIBCOMISO_LIBRARY})

tutorial/505_MIQ/main.cpp

@@ -1,7 +1,7 @@
 #define IGL_HEADER_ONLY
 #include <igl/readOBJ.h>
 #include <igl/viewer/Viewer.h>
-#include <igl/mixed_integer_quadrangulate.h>
+#include <igl/comiso/mixed_integer_quadrangulate.h>
 #include <igl/barycenter.h>
 #include <igl/avg_edge_length.h>
 #include <sstream>
@@ -74,7 +74,7 @@ void writePolyVf(const char *fname,
     fprintf(fp, "\n");
   }
   fclose(fp);
-  
+
 }
 
 
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
   Eigen::VectorXi isConstrained;
   std::vector<Eigen::MatrixXd> polyVF;
   readPolyVf("../shared/lilium.crossfield", isConstrained, polyVF);
-  
+
   Eigen::MatrixXd UV;
   Eigen::MatrixXi FUV;