compilation fixes for static library

Former-commit-id: 8341d2366731de633c87c58f469ff37fc430888f

include/igl/comiso/frame_field.cpp

@@ -1,9 +1,9 @@
 // This file is part of libigl, a simple c++ geometry processing library.
-// 
-// Copyright (C) 2015 Alec Jacobson <alecjacobson@gmail.com>
-// 
-// This Source Code Form is subject to the terms of the Mozilla Public License 
-// v. 2.0. If a copy of the MPL was not distributed with this file, You can 
+//
+// Copyright (C) 2015 Daniele Panozzo <daniele.panozzo@gmail.com>
+//
+// This Source Code Form is subject to the terms of the Mozilla Public License
+// v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
 #include "frame_field.h"
 
@@ -102,9 +102,6 @@ private:
 
 };
 
-
-
-
 FrameInterpolator::FrameInterpolator(const Eigen::MatrixXd& _V, const Eigen::MatrixXi& _F)
 {
   using namespace std;
@@ -232,7 +229,7 @@ void FrameInterpolator::interpolateCross()
   b.conservativeResize(num,Eigen::NoChange);
   bc.conservativeResize(num,Eigen::NoChange);
 
-  igl::nrosy(V, F, b, bc, 4, R, S);
+  igl::comiso::nrosy(V, F, b, bc, 4, R, S);
   //olga:end
   assert(R.rows() == F.rows());
 
@@ -651,9 +648,7 @@ Eigen::MatrixXd FrameInterpolator::getFieldPerFace()
 }
 
 }
-namespace igl
-{
-
+}
 
 IGL_INLINE void igl::comiso::frame_field(
                                  const Eigen::MatrixXd& V,

lib/CMakeCache.txt

@@ -1,535 +0,0 @@
-# This is the CMakeCache file.
-# For build in directory: /Users/daniele/Dropbox/igl/libigl/lib
-# It was generated by CMake: /usr/local/Cellar/cmake/3.2.3/bin/cmake
-# You can edit this file to change values found and used by cmake.
-# If you do not want to change any of the values, simply exit the editor.
-# If you do want to change a value, simply edit, save, and exit the editor.
-# The syntax for the file is as follows:
-# KEY:TYPE=VALUE
-# KEY is the name of a variable in the cache.
-# TYPE is a hint to GUIs for the type of VALUE, DO NOT EDIT TYPE!.
-# VALUE is the current value for the KEY.
-
-########################
-# EXTERNAL cache entries
-########################
-
-//Path to a file.
-ANT_TWEAK_BAR_INCLUDE_DIR:PATH=/Users/daniele/Dropbox/igl/libigl/external/AntTweakBar/include
-
-//Path to a library.
-ANT_TWEAK_BAR_LIBRARY:FILEPATH=/Users/daniele/Dropbox/igl/libigl/external/AntTweakBar/lib/libAntTweakBar.a
-
-//The directory containing a CMake configuration file for Boost.
-Boost_DIR:PATH=Boost_DIR-NOTFOUND
-
-//Path to a file.
-Boost_INCLUDE_DIR:PATH=/usr/local/include
-
-//The directory containing CGALConfig.cmake. This is either the
-// binary directory where CGAL was configured or PREFIX/lib/CGAL
-// for an installation.
-CGAL_DIR:PATH=/usr/local/lib/CGAL
-
-//Path to a program.
-CMAKE_AR:FILEPATH=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar
-
-//Choose the type of build, options are: None(CMAKE_CXX_FLAGS or
-// CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.
-CMAKE_BUILD_TYPE:STRING=
-
-//Enable/Disable color output during build.
-CMAKE_COLOR_MAKEFILE:BOOL=ON
-
-//CXX compiler
-CMAKE_CXX_COMPILER:FILEPATH=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++
-
-//Flags used by the compiler during all build types.
-CMAKE_CXX_FLAGS:STRING=
-
-//Flags used by the compiler during debug builds.
-CMAKE_CXX_FLAGS_DEBUG:STRING=-g
-
-//Flags used by the compiler during release builds for minimum
-// size.
-CMAKE_CXX_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
-
-//Flags used by the compiler during release builds.
-CMAKE_CXX_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
-
-//Flags used by the compiler during release builds with debug info.
-CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG
-
-//C compiler
-CMAKE_C_COMPILER:FILEPATH=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/cc
-
-//Flags used by the compiler during all build types.
-CMAKE_C_FLAGS:STRING=
-
-//Flags used by the compiler during debug builds.
-CMAKE_C_FLAGS_DEBUG:STRING=-g
-
-//Flags used by the compiler during release builds for minimum
-// size.
-CMAKE_C_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
-
-//Flags used by the compiler during release builds.
-CMAKE_C_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
-
-//Flags used by the compiler during release builds with debug info.
-CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG
-
-//Flags used by the linker.
-CMAKE_EXE_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Enable/Disable output of compile commands during generation.
-CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF
-
-//Path to a program.
-CMAKE_INSTALL_NAME_TOOL:FILEPATH=/usr/bin/install_name_tool
-
-//Install path prefix, prepended onto install directories.
-CMAKE_INSTALL_PREFIX:PATH=/usr/local
-
-//Path to a program.
-CMAKE_LINKER:FILEPATH=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
-
-//Path to a program.
-CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make
-
-//Flags used by the linker during the creation of modules.
-CMAKE_MODULE_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Path to a program.
-CMAKE_NM:FILEPATH=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/nm
-
-//Path to a program.
-CMAKE_OBJCOPY:FILEPATH=CMAKE_OBJCOPY-NOTFOUND
-
-//Path to a program.
-CMAKE_OBJDUMP:FILEPATH=CMAKE_OBJDUMP-NOTFOUND
-
-//Build architectures for OSX
-CMAKE_OSX_ARCHITECTURES:STRING=
-
-//Minimum OS X version to target for deployment (at runtime); newer
-// APIs weak linked. Set to empty string for default value.
-CMAKE_OSX_DEPLOYMENT_TARGET:STRING=
-
-//The product will be built against the headers and libraries located
-// inside the indicated SDK.
-CMAKE_OSX_SYSROOT:STRING=
-
-//Value Computed by CMake
-CMAKE_PROJECT_NAME:STATIC=libigl
-
-//Path to a program.
-CMAKE_RANLIB:FILEPATH=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib
-
-//Flags used by the linker during the creation of dll's.
-CMAKE_SHARED_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//If set, runtime paths are not added when installing shared libraries,
-// but are added when building.
-CMAKE_SKIP_INSTALL_RPATH:BOOL=NO
-
-//If set, runtime paths are not added when using shared libraries.
-CMAKE_SKIP_RPATH:BOOL=NO
-
-//Flags used by the linker during the creation of static libraries.
-CMAKE_STATIC_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_STATIC_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_STATIC_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Path to a program.
-CMAKE_STRIP:FILEPATH=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/strip
-
-//If true, cmake will use relative paths in makefiles and projects.
-CMAKE_USE_RELATIVE_PATHS:BOOL=OFF
-
-//If this value is on, makefiles will be generated without the
-// .SILENT directive, and all commands will be echoed to the console
-// during the make.  This is useful for debugging only. With Visual
-// Studio IDE projects all commands are done without /nologo.
-CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
-
-//The directory containing a CMake configuration file for COMISO.
-COMISO_DIR:PATH=COMISO_DIR-NOTFOUND
-
-//Path to a file.
-CORK_INCLUDE_DIR:PATH=CORK_INCLUDE_DIR-NOTFOUND
-
-//Path to a library.
-CORK_LIBRARIES:FILEPATH=CORK_LIBRARIES-NOTFOUND
-
-//Path to a file.
-EIGEN_INCLUDE_DIR:PATH=/usr/local/include/eigen3
-
-//The Eigen include path.
-EIGEN_INCLUDE_DIRS:PATH=/usr/local/include/eigen3
-
-//Path to a library.
-EMBREE_CORE_LIBRARY:FILEPATH=/Users/daniele/Dropbox/igl/libigl/external/embree/build/libembree_sse42.a
-
-//Path to a library.
-EMBREE_CORE_LIBRARY2:FILEPATH=/Users/daniele/Dropbox/igl/libigl/external/embree/build/libtransport.a
-
-//Path to a library.
-EMBREE_CORE_LIBRARY3:FILEPATH=/Users/daniele/Dropbox/igl/libigl/external/embree/build/libimage.a
-
-//Path to a library.
-EMBREE_CORE_LIBRARY4:FILEPATH=/Users/daniele/Dropbox/igl/libigl/external/embree/build/liblexers.a
-
-//Path to a library.
-EMBREE_CORE_LIBRARY5:FILEPATH=/Users/daniele/Dropbox/igl/libigl/external/embree/build/libembree.dylib
-
-//Path to a library.
-EMBREE_CORE_LIBRARY6:FILEPATH=/Users/daniele/Dropbox/igl/libigl/external/embree/build/libsys.a
-
-//Path to a file.
-EMBREE_INCLUDE_DIR:PATH=/Users/daniele/Dropbox/igl/libigl/external/embree/include
-
-//Path to a file.
-GLFW_INCLUDE_DIR:PATH=/Users/daniele/Dropbox/igl/libigl/external/glfw/include
-
-//Path to a library.
-GLFW_LIBRARIES:FILEPATH=/Users/daniele/Dropbox/igl/libigl/external/glfw/src/libglfw3.a
-
-//Path to a file.
-LIBCOMISO_INCLUDE_DIR:PATH=/Users/daniele/Dropbox/igl
-
-//Path to a library.
-LIBCOMISO_LIBRARY:FILEPATH=/usr/local/lib/libCoMISo.dylib
-
-//Path to a file.
-LIM_INCLUDE_DIR:PATH=LIM_INCLUDE_DIR-NOTFOUND
-
-//Path to a file.
-MATLAB_INCLUDE_DIR:PATH=/Applications/MATLAB_R2014b.app/extern/include
-
-//Path to a file.
-MOSEK_INCLUDE_DIR:PATH=MOSEK_INCLUDE_DIR-NOTFOUND
-
-//Path to a library.
-MOSEK_LIBRARIES:FILEPATH=MOSEK_LIBRARIES-NOTFOUND
-
-//Include for OpenGL on OSX
-OPENGL_INCLUDE_DIR:PATH=/System/Library/Frameworks/OpenGL.framework
-
-//OpenGL lib for OSX
-OPENGL_gl_LIBRARY:FILEPATH=/System/Library/Frameworks/OpenGL.framework
-
-//AGL lib for OSX
-OPENGL_glu_LIBRARY:FILEPATH=/System/Library/Frameworks/AGL.framework
-
-//C++ compiler flags for OpenMP parallization
-OpenMP_CXX_FLAGS:STRING=
-
-//C compiler flags for OpenMP parallization
-OpenMP_C_FLAGS:STRING=
-
-//Path to a library.
-PNG_LIBRARY:FILEPATH=/usr/local/lib/libpng.dylib
-
-//Path to a file.
-PNG_PNG_INCLUDE_DIR:PATH=/usr/local/include
-
-//Path to a file.
-TETGEN_INCLUDE_DIR:PATH=/Users/daniele/Dropbox/igl/libigl/external/tetgen
-
-//Path to a file.
-TINYXML2_INCLUDE_DIR:PATH=/Users/daniele/Dropbox/igl/libigl/external/tinyxml2
-
-//Path to a file.
-TRIANGLE_INCLUDE_DIR:PATH=/Users/daniele/Dropbox/igl/libigl/external/triangle
-
-//Path to a file.
-YIMG_INCLUDE_DIR:PATH=YIMG_INCLUDE_DIR-NOTFOUND
-
-//Path to a library.
-YIMG_LIBRARIES:FILEPATH=YIMG_LIBRARIES-NOTFOUND
-
-//Path to a file.
-ZLIB_INCLUDE_DIR:PATH=/usr/include
-
-//Path to a library.
-ZLIB_LIBRARY:FILEPATH=/usr/lib/libz.dylib
-
-//Dependencies for target
-igl_LIB_DEPENDS:STATIC=
-
-//Dependencies for target
-iglanttweakbar_LIB_DEPENDS:STATIC=
-
-//Dependencies for target
-iglbbw_LIB_DEPENDS:STATIC=
-
-//Dependencies for target
-iglboolean_LIB_DEPENDS:STATIC=
-
-//Dependencies for target
-iglcgal_LIB_DEPENDS:STATIC=
-
-//Dependencies for target
-iglcomiso_LIB_DEPENDS:STATIC=
-
-//Dependencies for target
-iglembree_LIB_DEPENDS:STATIC=
-
-//Dependencies for target
-iglmatlab_LIB_DEPENDS:STATIC=
-
-//Dependencies for target
-iglpng_LIB_DEPENDS:STATIC=
-
-//Dependencies for target
-igltetgen_LIB_DEPENDS:STATIC=
-
-//Dependencies for target
-igltriangle_LIB_DEPENDS:STATIC=
-
-//Dependencies for target
-iglviewer_LIB_DEPENDS:STATIC=
-
-//Dependencies for target
-iglxml_LIB_DEPENDS:STATIC=
-
-//Value Computed by CMake
-libigl_BINARY_DIR:STATIC=/Users/daniele/Dropbox/igl/libigl/lib
-
-//Value Computed by CMake
-libigl_SOURCE_DIR:STATIC=/Users/daniele/Dropbox/igl/libigl/optional
-
-
-########################
-# INTERNAL cache entries
-########################
-
-//ADVANCED property for variable: Boost_DIR
-Boost_DIR-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: Boost_INCLUDE_DIR
-Boost_INCLUDE_DIR-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_AR
-CMAKE_AR-ADVANCED:INTERNAL=1
-//This is the directory where this CMakeCache.txt was created
-CMAKE_CACHEFILE_DIR:INTERNAL=/Users/daniele/Dropbox/igl/libigl/lib
-//Major version of cmake used to create the current loaded cache
-CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
-//Minor version of cmake used to create the current loaded cache
-CMAKE_CACHE_MINOR_VERSION:INTERNAL=2
-//Patch version of cmake used to create the current loaded cache
-CMAKE_CACHE_PATCH_VERSION:INTERNAL=3
-//ADVANCED property for variable: CMAKE_COLOR_MAKEFILE
-CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1
-//Path to CMake executable.
-CMAKE_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.2.3/bin/cmake
-//Path to cpack program executable.
-CMAKE_CPACK_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.2.3/bin/cpack
-//Path to ctest program executable.
-CMAKE_CTEST_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.2.3/bin/ctest
-//ADVANCED property for variable: CMAKE_CXX_COMPILER
-CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS
-CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG
-CMAKE_CXX_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_MINSIZEREL
-CMAKE_CXX_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELEASE
-CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELWITHDEBINFO
-CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_COMPILER
-CMAKE_C_COMPILER-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS
-CMAKE_C_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG
-CMAKE_C_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_MINSIZEREL
-CMAKE_C_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_RELEASE
-CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_RELWITHDEBINFO
-CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//Path to cache edit program executable.
-CMAKE_EDIT_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.2.3/bin/ccmake
-//Executable file format
-CMAKE_EXECUTABLE_FORMAT:INTERNAL=Unknown
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS
-CMAKE_EXE_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_DEBUG
-CMAKE_EXE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
-CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELEASE
-CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXPORT_COMPILE_COMMANDS
-CMAKE_EXPORT_COMPILE_COMMANDS-ADVANCED:INTERNAL=1
-//Name of external makefile project generator.
-CMAKE_EXTRA_GENERATOR:INTERNAL=
-//Name of generator.
-CMAKE_GENERATOR:INTERNAL=Unix Makefiles
-//Name of generator platform.
-CMAKE_GENERATOR_PLATFORM:INTERNAL=
-//Name of generator toolset.
-CMAKE_GENERATOR_TOOLSET:INTERNAL=
-//Start directory with the top level CMakeLists.txt file for this
-// project
-CMAKE_HOME_DIRECTORY:INTERNAL=/Users/daniele/Dropbox/igl/libigl/optional
-//ADVANCED property for variable: CMAKE_INSTALL_NAME_TOOL
-CMAKE_INSTALL_NAME_TOOL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_LINKER
-CMAKE_LINKER-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MAKE_PROGRAM
-CMAKE_MAKE_PROGRAM-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS
-CMAKE_MODULE_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_DEBUG
-CMAKE_MODULE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL
-CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELEASE
-CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_NM
-CMAKE_NM-ADVANCED:INTERNAL=1
-//number of local generators
-CMAKE_NUMBER_OF_LOCAL_GENERATORS:INTERNAL=1
-//ADVANCED property for variable: CMAKE_OBJCOPY
-CMAKE_OBJCOPY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_OBJDUMP
-CMAKE_OBJDUMP-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_RANLIB
-CMAKE_RANLIB-ADVANCED:INTERNAL=1
-//Path to CMake installation.
-CMAKE_ROOT:INTERNAL=/usr/local/Cellar/cmake/3.2.3/share/cmake
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
-CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG
-CMAKE_SHARED_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL
-CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELEASE
-CMAKE_SHARED_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SKIP_INSTALL_RPATH
-CMAKE_SKIP_INSTALL_RPATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SKIP_RPATH
-CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS
-CMAKE_STATIC_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_DEBUG
-CMAKE_STATIC_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL
-CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_RELEASE
-CMAKE_STATIC_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_STRIP
-CMAKE_STRIP-ADVANCED:INTERNAL=1
-//uname command
-CMAKE_UNAME:INTERNAL=/usr/bin/uname
-//ADVANCED property for variable: CMAKE_USE_RELATIVE_PATHS
-CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
-CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: EIGEN_INCLUDE_DIR
-EIGEN_INCLUDE_DIR-ADVANCED:INTERNAL=1
-//Details about finding Eigen
-FIND_PACKAGE_MESSAGE_DETAILS_Eigen:INTERNAL=[/usr/local/include/eigen3][TRUE][v(3.2.0)]
-//Details about finding ZLIB
-FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[/usr/lib/libz.dylib][/usr/include][v1.2.5()]
-//ADVANCED property for variable: LIM_INCLUDE_DIR
-LIM_INCLUDE_DIR-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: MATLAB_INCLUDE_DIR
-MATLAB_INCLUDE_DIR-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: OPENGL_INCLUDE_DIR
-OPENGL_INCLUDE_DIR-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: OPENGL_gl_LIBRARY
-OPENGL_gl_LIBRARY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: OPENGL_glu_LIBRARY
-OPENGL_glu_LIBRARY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: OpenMP_CXX_FLAGS
-OpenMP_CXX_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: OpenMP_C_FLAGS
-OpenMP_C_FLAGS-ADVANCED:INTERNAL=1
-//Test OpenMP_FLAG_DETECTED
-OpenMP_FLAG_DETECTED:INTERNAL=
-//ADVANCED property for variable: PNG_LIBRARY
-PNG_LIBRARY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: PNG_PNG_INCLUDE_DIR
-PNG_PNG_INCLUDE_DIR-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: TETGEN_INCLUDE_DIR
-TETGEN_INCLUDE_DIR-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: TINYXML2_INCLUDE_DIR
-TINYXML2_INCLUDE_DIR-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: TRIANGLE_INCLUDE_DIR
-TRIANGLE_INCLUDE_DIR-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: YIMG_INCLUDE_DIR
-YIMG_INCLUDE_DIR-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: YIMG_LIBRARIES
-YIMG_LIBRARIES-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: ZLIB_INCLUDE_DIR
-ZLIB_INCLUDE_DIR-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: ZLIB_LIBRARY
-ZLIB_LIBRARY-ADVANCED:INTERNAL=1
-//Components requested for this build tree.
-_Boost_COMPONENTS_SEARCHED:INTERNAL=
-//Last used Boost_INCLUDE_DIR value.
-_Boost_INCLUDE_DIR_LAST:INTERNAL=/usr/local/include
-//Last used Boost_NAMESPACE value.
-_Boost_NAMESPACE_LAST:INTERNAL=boost
-//Last used Boost_USE_MULTITHREADED value.
-_Boost_USE_MULTITHREADED_LAST:INTERNAL=TRUE
-

lib/Makefile.REMOVED.git-id

@@ -1 +0,0 @@
-530630064ee7f00fe1e7c06b0a867d962da891b1

optional/CMakeLists.txt

@@ -27,6 +27,14 @@ else (ANTTWEAKBAR_FOUND)
   message(STATUS "AntTweakBar not found.")
 endif(ANTTWEAKBAR_FOUND)
 
+## Check for NANOGUI
+find_package(NANOGUI QUIET)
+if (NANOGUI_FOUND)
+  include_directories( ${NANOGUI_INCLUDE_DIRS})
+else (NANOGUI_FOUND)
+  message(STATUS "nanogui not found.")
+endif(NANOGUI_FOUND)
+
 ## Check for Boost
 find_package(BOOST QUIET)
 if (Boost_FOUND)
@@ -214,12 +222,12 @@ if (MATLAB_FOUND)
 endif (MATLAB_FOUND)
 
 #### Compile the png part
-if (PNG_FOUND)
+if (PNG_FOUND AND YIMG_FOUND)
   file(GLOB SOURCES_PNG
     "${PROJECT_SOURCE_DIR}/../include/igl/png/*.cpp"
   )
   add_library(iglpng STATIC ${SOURCES_PNG})
-endif (PNG_FOUND)
+endif (PNG_FOUND AND YIMG_FOUND)
 
 #### Compile the tetgen part
 if (TETGEN_FOUND)
@@ -258,10 +266,10 @@ if (LIBCOMISO_FOUND)
 endif (LIBCOMISO_FOUND)
 
 #### Compile the viewer
-if (GLFW_FOUND AND ANTTWEAKBAR_FOUND)
-  file(GLOB SOURCES_XML
+if (GLFW_FOUND AND NANOGUI_FOUND)
+  file(GLOB SOURCES_VIEWER
     "${PROJECT_SOURCE_DIR}/../include/igl/viewer/*.cpp"
   )
 
-  add_library(iglviewer STATIC ${SOURCES_XML})
-endif (GLFW_FOUND AND ANTTWEAKBAR_FOUND)
+  add_library(iglviewer STATIC ${SOURCES_VIEWER})
+endif (GLFW_FOUND AND NANOGUI_FOUND)

tutorial/505_MIQ/main.cpp

@@ -277,7 +277,7 @@ int main(int argc, char *argv[])
   igl::comb_frame_field(V, F, X1, X2, BIS1_combed, BIS2_combed, X1_combed, X2_combed);
 
   // Global parametrization
-  igl::miq(V,
+  igl::comiso::miq(V,
            F,
            X1_combed,
            X2_combed,
@@ -294,7 +294,7 @@ int main(int argc, char *argv[])
            true);
 
 // Global parametrization (with seams, only for demonstration)
-igl::miq(V,
+igl::comiso::miq(V,
          F,
          X1_combed,
          X2_combed,

tutorial/506_FrameField/main.cpp

@@ -197,7 +197,7 @@ int main(int argc, char *argv[])
   igl::comiso::frame_field(V, F, b, bc1, bc2, FF1, FF2);
 
   // Deform the mesh to transform the frame field in a cross field
-  igl::comiso::frame_field_deformer(
+  igl::frame_field_deformer(
     V,F,FF1,FF2,V_deformed,FF1_deformed,FF2_deformed);
 
   // Compute face barycenters deformed mesh
@@ -228,7 +228,7 @@ int main(int argc, char *argv[])
   // The other representative of the cross field is simply rotated by 90 degrees
   MatrixXd B1,B2,B3;
   igl::local_basis(V_deformed,F,B1,B2,B3);
-  X2_deformed = 
+  X2_deformed =
     igl::rotate_vectors(X1_deformed, VectorXd::Constant(1,M_PI/2), B1, B2);
 
   // Global seamless parametrization