most of the tutorials are working again

the static build is working again


Former-commit-id: c1935f0d85f503a79ba40c1f6b76f5d7903aa623

cmake/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
 project(libigl)
 
 ### Available options ###
-option(LIBIGL_USE_STATIC_LIBRARY "Use libIGL as static library" OFF)
+option(LIBIGL_USE_STATIC_LIBRARY "Use libIGL as static library" ON)
 option(LIBIGL_WITH_BBW         "Use BBW"            OFF)
 option(LIBIGL_WITH_BOOLEAN     "Use Cork boolean"   OFF)
 option(LIBIGL_WITH_CGAL        "Use CGAL"           OFF)
@@ -42,16 +42,6 @@ if(LIBIGL_USE_STATIC_LIBRARY)
   add_definitions(-DIGL_STATIC_LIBRARY)
 endif()
 
-#if(APPLE)
-#  set(CMAKE_CXX_LINK_FLAGS "-framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo")
-#  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2")
-#endif()
-
-#if(UNIX AND NOT APPLE)
-#  set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -lGL -lGLU -lrt -lX11 -lXxf86vm -lXrandr -lpthread -lXi  -lXcursor -lXinerama ")
-#  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx")
-#endif()
-
 ### macro definition ###
 set(LIBIGL_ROOT "${PROJECT_SOURCE_DIR}/..")
 set(LIBIGL_SOURCE_DIR "${LIBIGL_ROOT}/include")
@@ -59,11 +49,19 @@ set(LIBIGL_EXTERNAL "${LIBIGL_ROOT}/external")
 
 macro(CompileIGL_Module module)
   file(GLOB SOURCES_${module}
-  "${LIBIGL_SOURCE_DIR}/igl/${module}/*.cpp")
+  "${LIBIGL_SOURCE_DIR}/igl/${module}/*.cpp"
+  )
   add_library(igl${module} STATIC ${SOURCES_${module}})
   list(APPEND LIBIGL_LIBRARIES "igl${module}")
 endmacro()
 
+macro(CompileIGL_Module_Copyleft module)
+  file(GLOB SOURCES_${module}
+  "${LIBIGL_SOURCE_DIR}/igl/copyleft/${module}/*.cpp"
+  )
+  add_library(igl${module} STATIC ${SOURCES_${module}})
+  list(APPEND LIBIGL_LIBRARIES "igl${module}")
+endmacro()
 
 ### Eigen ###
 set(EIGEN_INCLUDE_DIR "${LIBIGL_EXTERNAL}/nanogui/ext/eigen")
@@ -82,7 +80,9 @@ endif()
 list(APPEND LIBIGL_INCLUDE_DIRS "${LIBIGL_SOURCE_DIR}")
 if(LIBIGL_USE_STATIC_LIBRARY)
   include_directories("${LIBIGL_SOURCE_DIR}")
-  file(GLOB SOURCES_IGL "${LIBIGL_SOURCE_DIR}/igl/*.cpp")
+  file(GLOB SOURCES_IGL
+  "${LIBIGL_SOURCE_DIR}/igl/*.cpp"
+  "${LIBIGL_SOURCE_DIR}/igl/copyleft/*.cpp")
   add_library(igl STATIC ${SOURCES_IGL})
   list(APPEND LIBIGL_LIBRARIES "igl")
 endif()
@@ -224,7 +224,7 @@ if(LIBIGL_WITH_TETGEN)
 
   if(LIBIGL_USE_STATIC_LIBRARY)
     include_directories(${TETGEN_DIR})
-    CompileIGL_Module("tetgen")
+    CompileIGL_Module_Copyleft("tetgen")
   endif()
 endif()
 
@@ -243,6 +243,7 @@ endif()
 
 ### Compile the viewer ###
 if(LIBIGL_WITH_VIEWER) # to finish cleaning
+  add_definitions(-DIGL_VIEWER_WITH_NANOGUI)
   set(NANOGUI_DIR "${LIBIGL_EXTERNAL}/nanogui")
   set(NANOGUI_INCLUDE_DIRS
     "${NANOGUI_DIR}/include"
@@ -257,7 +258,7 @@ if(LIBIGL_WITH_VIEWER) # to finish cleaning
   list(APPEND LIBIGL_INCLUDE_DIRS ${NANOGUI_INCLUDE_DIRS})
   list(APPEND LIBIGL_EXTRA_LIBRARIES "nanogui" "glfw" ${GLFW_LIBRARIES} pthread)
 
-  if(WIN32 OR UNIX) # GLEW should not be needed on Linux
+  if((WIN32 OR UNIX) AND NOT APPLE) # GLEW should not be needed on Linux
     include_directories("${NANOGUI_DIR}/ext/glew/include")
     list(APPEND LIBIGL_INCLUDE_DIRS "${NANOGUI_DIR}/ext/glew/include")
     list(APPEND LIBIGL_EXTRA_SOURCES "${NANOGUI_DIR}/ext/glew/src/glew.c")

optional/CMakeLists.txt

@@ -1,333 +1,56 @@
 cmake_minimum_required(VERSION 2.6)
 project(libigl)
 
-SET(CMAKE_SKIP_RULE_DEPENDENCY 1)
-
-# SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ../../lib)
-SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../tutorial/cmake)
-find_package(EIGEN REQUIRED)
-
-add_definitions(-DIGL_STATIC_LIBRARY)
-option(LIBIGL_VIEWER_WITH_NANOGUI "Enable nanogui " OFF)
-
-#option(LIBIGL_NO_OPENGL "Disable OpenGL2 legacy features in main library" ON)
-#option(LIBIGL_OPENGL_4 "Enable OpenGL4 features in optional libraries" ON)
-#
-#if(LIBIGL_NO_OPENGL)
-#  add_definitions(-DIGL_NO_OPENGL)
-#endif(LIBIGL_NO_OPENGL)
-#if(LIBIGL_OPENGL_4)
-#  add_definitions(-DIGL_OPENGL_4)
-#endif(LIBIGL_OPENGL_4)
-
-## Check for GLFW
-find_package(GLFWH QUIET)
-if (GLFW_FOUND)
-  include_directories( ${GLFW_INCLUDE_DIR})
-else (GLFW_FOUND)
-  message(STATUS "GLFW not found.")
-endif(GLFW_FOUND)
-
-## Check for GLEW
-find_package(GLEW QUIET)
-if (GLEW_FOUND)
-  include_directories( ${GLEW_INCLUDE_DIR})
-else (GLEW_FOUND)
-  message(STATUS "GLEW not found.")
-endif(GLEW_FOUND)
-
-find_package(OpenGL QUIET)
-
-## Check for Anttweakbar
-find_package(ANTTWEAKBAR QUIET)
-if (ANTTWEAKBAR_FOUND)
-  include_directories( ${ANT_TWEAK_BAR_INCLUDE_DIR})
-else (ANTTWEAKBAR_FOUND)
-  message(STATUS "AntTweakBar not found.")
-endif(ANTTWEAKBAR_FOUND)
-
-## Check for NANOGUI
-if(LIBIGL_VIEWER_WITH_NANOGUI)
-  find_package(NANOGUIH QUIET)
-  #message(FATAL_ERROR "nanogui not found. ${NANOGUI_INCLUDE_DIRS}")
-  if (NANOGUI_FOUND)
-    include_directories( ${NANOGUI_INCLUDE_DIRS})
-  else (NANOGUI_FOUND)
-    message(STATUS "nanogui not found.")
-  endif(NANOGUI_FOUND)
+### Compilation flags: adapt to your needs ###
+if(MSVC)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /bigobj") ### Enable parallel compilation
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR} )
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR} )
+else()
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") #### Libigl requires a modern C++ compiler that supports c++11
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../" )
 endif()
 
-## Check for Boost
-find_package(BOOST QUIET)
-if (Boost_FOUND)
-  include_directories( ${BOOST_INCLUDE_DIR})
-endif(Boost_FOUND)
-
-
-## Check for CoMiSo, if not available skip the examples that depends on it
-find_package(LIBCOMISOH QUIET)
-if (LIBCOMISO_FOUND)
-  include_directories( ${LIBCOMISO_INCLUDE_DIRS})
-endif(LIBCOMISO_FOUND)
-
-## Check for MATLAB, if not available skip the examples that depends on it
-find_package(MATLAB QUIET)
-if (MATLAB_FOUND)
-  include_directories( ${MATLAB_INCLUDE_DIR})
-else (MATLAB_FOUND)
-  message(STATUS "MATLAB not found.")
-endif(MATLAB_FOUND)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
 
-## Check for EMBREE, if not available skip the examples that depends on it
-find_package(EMBREEH QUIET)
-if (EMBREE_FOUND)
-  include_directories( ${EMBREE_INCLUDE_DIR})
-else (EMBREE_FOUND)
-  message(STATUS "Embree not found.")
-endif(EMBREE_FOUND)
-
-## Check for CGAL, if not available skip the examples that depends on it
-find_package(CGAL QUIET)
-
-## Check for mosek
-find_package(MOSEK QUIET)
-if(MOSEK_FOUND)
-  include_directories(${MOSEK_INCLUDE_DIR})
-else(MOSEK_FOUND)
-  add_definitions(-DIGL_NO_MOSEK)
-endif(MOSEK_FOUND)
-
-## Check for CORK
-find_package(CORK QUIET)
-if (NOT CORK_FOUND)
-  add_definitions(-DIGL_NO_CORK)
-else(NOT CORK_FOUND)
-  include_directories( ${CORK_INCLUDE_DIR})
-endif(NOT CORK_FOUND)
-
-## Check for LIM
-find_package(LIM QUIET)
-if(LIM_FOUND)
-  include_directories( ${LIM_INCLUDE_DIR})
-endif(LIM_FOUND)
-
-## Check for PNG
-find_package(PNG QUIET)
-if(PNG_FOUND)
-  include_directories( ${PNG_INCLUDE_DIR})
-else(PNG_FOUND)
-  message(STATUS "PNG not found")
-endif(PNG_FOUND)
-
-## Check for TETGEN
-find_package(TETGEN QUIET)
-if(TETGEN_FOUND)
-  include_directories( ${TETGEN_INCLUDE_DIR})
-else(TETGEN_FOUND)
-  message(STATUS "Tetgen not found.")
-endif(TETGEN_FOUND)
-
-## Check for TRIANGLE
-find_package(TRIANGLE QUIET)
-if(TRIANGLE_FOUND)
-  include_directories( ${TRIANGLE_INCLUDE_DIR})
-endif(TRIANGLE_FOUND)
-
-## Check for TINYXML2
-find_package(TINYXML2 QUIET)
-if(TINYXML2_FOUND)
-  include_directories( ${TINYXML2_INCLUDE_DIR})
-endif(TINYXML2_FOUND)
-
-## Check for COMISO
-find_package(COMISO QUIET)
-if(COMISO_FOUND)
-  include_directories( ${COMISO_INCLUDE_DIR})
-endif(COMISO_FOUND)
-
-## Use openMP if available
-find_package(OpenMP)
-if (OPENMP_FOUND AND NOT WIN32)
-  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+### libIGL options: choose between header only and compiled static library
+option(LIBIGL_USE_STATIC_LIBRARY "Use LibIGL as static library" ON)
+if(LIBIGL_USE_STATIC_LIBRARY)
+  add_definitions(-DIGL_STATIC_LIBRARY)
 endif()
 
-## Check for YIMG
-find_package(YIMG QUIET)
-if(YIMG_FOUND)
-  include_directories( ${YIMG_INCLUDE_DIR})
-else(YIMG_FOUND)
-  message(STATUS "YIMG not found")
-endif(YIMG_FOUND)
-
-IF(MSVC)
-### Enable parallel compilation for Visual Studio
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-ELSE(MSVC)
-#### Libigl requires a modern C++ compiler that supports c++11
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-ENDIF(MSVC)
-
-#### Compile the core library that depends only on EIGEN ####
-include_directories( ${EIGEN_INCLUDE_DIR})
-include_directories( ${PROJECT_SOURCE_DIR}/../include/)
-
-file(GLOB SOURCES
-  "${PROJECT_SOURCE_DIR}/../include/igl/*.cpp"
-  "${PROJECT_SOURCE_DIR}/../include/igl/copyleft/*.cpp"
-)
-
-add_library(igl STATIC ${SOURCES})
-set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES} "igl")
-
-#### Compile the AntTweakBar part
-if (ANTTWEAKBAR_FOUND)
-  file(GLOB SOURCES_ANTTWEAKBAR
-    "${PROJECT_SOURCE_DIR}/../include/igl/anttweakbar/*.cpp"
-  )
-add_library(iglanttweakbar STATIC ${SOURCES_ANTTWEAKBAR})
-set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES} "iglanttweakbar")
-endif (ANTTWEAKBAR_FOUND)
-
-#### Compile the BBW part
-file(GLOB SOURCES_BBW
-  "${PROJECT_SOURCE_DIR}/../include/igl/bbw/*.cpp"
-)
-add_library(iglbbw STATIC ${SOURCES_BBW})
-set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES} "iglbbw")
-
-#### Compile the boolean and cgal parts
-if (CGAL_FOUND)
-#### Compile the boolean part
-if (NOT CORK_FOUND)
-  add_definitions(-DIGL_NO_CORK)
-endif(NOT CORK_FOUND)
-file(GLOB SOURCES_BOOLEAN
-  "${PROJECT_SOURCE_DIR}/../include/igl/copyleft/boolean/*.cpp"
-)
-add_library(iglboolean STATIC ${SOURCES_BOOLEAN})
-set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES} "iglboolean")
-#### Compile the cgal part
-  file(GLOB SOURCES_CGAL
-    "${PROJECT_SOURCE_DIR}/../include/igl/copyleft/cgal/*.cpp"
-  )
-add_library(iglcgal STATIC ${SOURCES_CGAL})
-set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES} "iglcgal")
-endif (CGAL_FOUND)
-
-#### Compile the comiso part
-if (LIBCOMISO_FOUND)
-  file(GLOB SOURCES_COMISO
-    "${PROJECT_SOURCE_DIR}/../include/igl/comiso/*.cpp"
-  )
-  add_library(iglcomiso STATIC ${SOURCES_COMISO})
-  set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES} "iglcomiso")
-endif (LIBCOMISO_FOUND)
-
-#### Compile the embree part
-if (EMBREE_FOUND)
-  file(GLOB SOURCES_EMBREE
-    "${PROJECT_SOURCE_DIR}/../include/igl/embree/*.cpp"
-  )
-  add_library(iglembree STATIC ${SOURCES_EMBREE})
-  set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES} "iglembree")
-endif (EMBREE_FOUND)
-
-#### Compile the lim part
-if (LIM_FOUND)
-  file(GLOB SOURCES_LIM
-    "${PROJECT_SOURCE_DIR}/../include/igl/lim/*.cpp"
-  )
-  add_library(igllim STATIC ${SOURCES_LIM})
-  set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES} "igllim")
-endif (LIM_FOUND)
-
-#### Compile the matlab part
-if (MATLAB_FOUND)
-  file(GLOB SOURCES_MATLAB
-    "${PROJECT_SOURCE_DIR}/../include/igl/matlab/*.cpp"
-  )
-  add_library(iglmatlab STATIC ${SOURCES_MATLAB})
-  set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES} "iglmatlab")
-endif (MATLAB_FOUND)
-
-#### Compile the mosek part
-if (MOSEK_FOUND)
-  file(GLOB SOURCES_MOSEK
-    "${PROJECT_SOURCE_DIR}/../include/igl/mosek/*.cpp"
-  )
-add_library(iglmosek STATIC ${SOURCES_MOSEK})
-set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES} "iglmosek")
-endif (MOSEK_FOUND)
-
-#### Compile the opengl parts
-if (OPENGL_FOUND)
-  file(GLOB SOURCES_OPENGL2
-    "${PROJECT_SOURCE_DIR}/../include/igl/opengl2/*.cpp"
-  )
-  add_library(iglopengl2 STATIC ${SOURCES_OPENGL2})
-  set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES} "iglopengl2")
-  file(GLOB SOURCES_OPENGL
-    "${PROJECT_SOURCE_DIR}/../include/igl/opengl/*.cpp"
-  )
-  add_library(iglopengl STATIC ${SOURCES_OPENGL})
-  set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES} "iglopengl")
-endif (OPENGL_FOUND)
-
-#### Compile the png part
-if (PNG_FOUND AND YIMG_FOUND AND OPENGL_FOUND)
-  file(GLOB SOURCES_PNG
-    "${PROJECT_SOURCE_DIR}/../include/igl/png/*.cpp"
-  )
-  add_library(iglpng STATIC ${SOURCES_PNG})
-  set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES} "iglpng")
-
-endif (PNG_FOUND AND YIMG_FOUND AND OPENGL_FOUND)
-
-#### Compile the tetgen part
-if (TETGEN_FOUND)
-  file(GLOB SOURCES_TETGEN
-    "${PROJECT_SOURCE_DIR}/../include/igl/copyleft/tetgen/*.cpp"
-  )
-
-  add_library(igltetgen STATIC ${SOURCES_TETGEN})
-  set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES} "igltetgen")
-
-endif (TETGEN_FOUND)
-
-#### Compile the triangle part
-if (TRIANGLE_FOUND)
-  file(GLOB SOURCES_TRIANGLE
-    "${PROJECT_SOURCE_DIR}/../include/igl/triangle/*.cpp"
-  )
-
-  add_library(igltriangle STATIC ${SOURCES_TRIANGLE})
-  set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES} "igltriangle")
-
-endif (TRIANGLE_FOUND)
-
-#### Compile the viewer
-if(LIBIGL_VIEWER_WITH_NANOGUI)
-  if (NANOGUI_FOUND)
-    add_definitions(-DIGL_VIEWER_WITH_NANOGUI)
-  endif (NANOGUI_FOUND)
+### libIGL options: decide if you want the nanogui bar in the viewer
+option(LIBIGL_WITH_VIEWER      "Use Nanogui Viewer" OFF)
+if(LIBIGL_WITH_VIEWER)
+  add_definitions(-DIGL_VIEWER_WITH_NANOGUI)
 endif()
-file(GLOB SOURCES_VIEWER
-  "${PROJECT_SOURCE_DIR}/../include/igl/viewer/*.cpp"
-)
-add_library(iglviewer STATIC ${SOURCES_VIEWER})
-set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES} "iglviewer")
-
-#### Compile the xml part
-if (TINYXML2_FOUND)
-  file(GLOB SOURCES_XML
-    "${PROJECT_SOURCE_DIR}/../include/igl/xml/*.cpp"
-  )
-  add_library(iglxml STATIC ${SOURCES_XML})
-  set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES} "iglxml")
-endif (TINYXML2_FOUND)
 
-# Pass the list of compiled libraries to the parent if there is one
-if(NOT ${CMAKE_PROJECT_NAME} STREQUAL ${PROJECT_NAME})
-  set(LIBIGL_LIBRARIES ${LIBIGL_LIBRARIES} PARENT_SCOPE)
-endif (NOT ${CMAKE_PROJECT_NAME} STREQUAL ${PROJECT_NAME})
+### libIGL options: choose your dependencies (by default everything is OFF, in this example we need the viewer) ###
+option(LIBIGL_WITH_BBW         "Use BBW"            ON)
+option(LIBIGL_WITH_EMBREE      "Use Embree"         ON)
+option(LIBIGL_WITH_OPENGL      "Use OpenGL"         ON)
+option(LIBIGL_WITH_PNG         "Use PNG"            ON)
+option(LIBIGL_WITH_TETGEN      "Use Tetgen"         ON)
+option(LIBIGL_WITH_TRIANGLE    "Use Triangle"       ON)
+option(LIBIGL_WITH_XML         "Use XML"            ON)
+
+### Still need to be tested ----
+option(LIBIGL_WITH_LIM         "Use LIM"            OFF)
+option(LIBIGL_WITH_COMISO      "Use CoMiso"         OFF)
+option(LIBIGL_WITH_BOOLEAN     "Use Cork boolean"   OFF)
+option(LIBIGL_WITH_CGAL        "Use CGAL"           OFF)
+#option(LIBIGL_WITH_MATLAB      "Use Matlab"         OFF)
+#option(LIBIGL_WITH_MOSEK       "Use MOSEK"          OFF)
+
+### END TESTING
+
+### Adding libIGL: choose the path to your local copy libIGL ###
+### This is going to compile everything you requested ###
+add_subdirectory("${PROJECT_SOURCE_DIR}/../cmake" "libigl")
+
+### ligIGL information ###
+message("libIGL includes: ${LIBIGL_INCLUDE_DIRS}")
+message("libIGL libraries: ${LIBIGL_LIBRARIES}")
+message("libIGL extra sources: ${LIBIGL_EXTRA_SOURCES}")
+message("libIGL extra libraries: ${LIBIGL_EXTRA_LIBRARIES}")
+message("libIGL definitions: ${LIBIGL_DEFINITIONS}")

tutorial/CMakeLists.shared

@@ -1,93 +0,0 @@
-# http://stackoverflow.com/a/18234926/148668
-# -stdlib=libc++ breaks gcc (for clang, the correct stdlib will be used with
-# -std=c++11 anyway)
-macro(remove_cxx_flag flag)
-  string(REPLACE "${flag}" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-endmacro()
-remove_cxx_flag("-stdlib=libc++")
-if(NOT CMAKELISTS_SHARED_INCLUDED)
-set(CMAKELISTS_SHARED_INCLUDED TRUE)
-
-if(MSVC)
-### Enable parallel compilation for Visual Studio
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-else(MSVC)
-#### Libigl requires a modern C++ compiler that supports c++11
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-endif(MSVC)
-
-find_package(OpenMP)
-if (OPENMP_FOUND AND NOT WIN32)
-  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-endif()
-
-set(CMAKE_VERBOSE_MAKEFILE ON)
-
-set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../cmake ${PROJECT_SOURCE_DIR}/cmake)
-set(CMAKE_COLOR_MAKEFILE ON)
-
-############################
-## SEPARATE BUILD OPTIONS ##
-############################
-
-find_package(OpenGL REQUIRED)
-find_package(EIGEN REQUIRED)
-find_package(GLFWH REQUIRED)
-
-if(NOT APPLE)
-  find_package(GLEW REQUIRED)
-endif(NOT APPLE)
-
-if(APPLE)
-  set(CMAKE_CXX_LINK_FLAGS "-framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
-endif (APPLE)
-
-if(UNIX AND NOT APPLE)
-  set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -lGL -lGLU -lrt -lX11 -lXxf86vm -lXrandr -lpthread -lXi  -lXcursor -lXinerama ")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
-endif(UNIX AND NOT APPLE)
-
-if(NOT APPLE)
-  include_directories( ${GLEW_INCLUDE_DIR} )
-endif(NOT APPLE)
-
-include_directories( ${EIGEN_INCLUDE_DIR})
-include_directories( ${GLFW_INCLUDE_DIR})
-include_directories(
-  /usr/local/include
-  /opt/local/include
-  ${PROJECT_SOURCE_DIR}
-  ${OPENGL_INCLUDE_DIR}
-)
-
-link_directories(
-  /usr/local/lib
-  ${EIGEN_DIRS}
-)
-
-# Disable deprecated opengl code from libigl
-add_definitions(-DIGL_OPENGL_4)
-
-IF(CMAKE_BUILD_TYPE MATCHES RELEASE)
-  add_definitions(-DNDEBUG)
-ENDIF(CMAKE_BUILD_TYPE MATCHES RELEASE)
-
-if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-register")
-endif()
-
-
-if(NOT APPLE)
-  set(SHARED_SOURCES ${SHARED_SOURCES} ${GLEW_SOURCES})
-endif(NOT APPLE)
-
-set(SHARED_LIBRARIES
-  ${OPENGL_LIBRARIES}
-  ${EIGEN_LIBRARIES}
-  ${GLEW_LIBRARIES}
-)
-
-endif(NOT CMAKELISTS_SHARED_INCLUDED)

tutorial/CMakeLists.txt

@@ -14,30 +14,43 @@ endif()
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
 
 
-### libIGL options: choose between header only and comiled static library
-option(LIBIGL_USE_STATIC_LIBRARY "Use LibIGL as static library" OFF)
+### libIGL options: choose between header only and compiled static library
+option(LIBIGL_USE_STATIC_LIBRARY "Use LibIGL as static library" ON)
+if(LIBIGL_USE_STATIC_LIBRARY)
+  add_definitions(-DIGL_STATIC_LIBRARY)
+endif()
+
+### libIGL options: decide if you want the nanogui bar in the viewer
+option(LIBIGL_WITH_VIEWER      "Use Nanogui Viewer" ON)
+if(LIBIGL_WITH_VIEWER)
+  add_definitions(-DIGL_VIEWER_WITH_NANOGUI)
+endif()
 
 ### libIGL options: choose your dependencies (by default everything is OFF, in this example we need the viewer) ###
-#option(LIBIGL_WITH_BBW         "Use BBW"            ON)
+option(LIBIGL_WITH_BBW         "Use BBW"            ON)
+option(LIBIGL_WITH_EMBREE      "Use Embree"         ON)
+option(LIBIGL_WITH_OPENGL      "Use OpenGL"         ON)
+option(LIBIGL_WITH_PNG         "Use PNG"            ON)
+option(LIBIGL_WITH_TETGEN      "Use Tetgen"         ON)
+option(LIBIGL_WITH_TRIANGLE    "Use Triangle"       ON)
+option(LIBIGL_WITH_XML         "Use XML"            ON)
+
+### Still need to be tested ----
+option(LIBIGL_WITH_LIM         "Use LIM"            OFF)
+
+option(LIBIGL_WITH_COMISO      "Use CoMiso"         OFF)
 option(LIBIGL_WITH_BOOLEAN     "Use Cork boolean"   OFF)
 option(LIBIGL_WITH_CGAL        "Use CGAL"           OFF)
-#option(LIBIGL_WITH_COMISO      "Use CoMiso"         OFF)
-#option(LIBIGL_WITH_EMBREE      "Use Embree"         ON)
-#option(LIBIGL_WITH_LIM         "Use LIM"            ON)
 #option(LIBIGL_WITH_MATLAB      "Use Matlab"         OFF)
 #option(LIBIGL_WITH_MOSEK       "Use MOSEK"          OFF)
-#option(LIBIGL_WITH_OPENGL      "Use OpenGL"         ON)
-#option(LIBIGL_WITH_PNG         "Use PNG"            ON)
-#option(LIBIGL_WITH_TETGEN      "Use Tetgen"         ON)
-#option(LIBIGL_WITH_TRIANGLE    "Use Triangle"       ON)
-option(LIBIGL_WITH_VIEWER      "Use Nanogui Viewer" ON)
-#option(LIBIGL_WITH_XML         "Use XML"            OFF)
+
+### END TESTING
 
 ### Adding libIGL: choose the path to your local copy libIGL ###
 ### This is going to compile everything you requested ###
 add_subdirectory("${PROJECT_SOURCE_DIR}/../cmake" "libigl")
 
-### ligIBL information ###
+### ligIGL information ###
 message("libIGL includes: ${LIBIGL_INCLUDE_DIRS}")
 message("libIGL libraries: ${LIBIGL_LIBRARIES}")
 message("libIGL extra sources: ${LIBIGL_EXTRA_SOURCES}")
@@ -46,12 +59,12 @@ message("libIGL definitions: ${LIBIGL_DEFINITIONS}")
 
 ### Choose which chapters to compile ###
 option(TUTORIALS_CHAPTER1 "Compile chapter 1" ON)
-option(TUTORIALS_CHAPTER2 "Compile chapter 2" OFF)
-option(TUTORIALS_CHAPTER3 "Compile chapter 3" OFF)
-option(TUTORIALS_CHAPTER4 "Compile chapter 4" OFF)
-option(TUTORIALS_CHAPTER5 "Compile chapter 5" OFF)
-option(TUTORIALS_CHAPTER6 "Compile chapter 6" OFF)
-option(TUTORIALS_CHAPTER7 "Compile chapter 7" OFF)
+option(TUTORIALS_CHAPTER2 "Compile chapter 2" ON)
+option(TUTORIALS_CHAPTER3 "Compile chapter 3" ON)
+option(TUTORIALS_CHAPTER4 "Compile chapter 4" ON)
+option(TUTORIALS_CHAPTER5 "Compile chapter 5" ON)
+option(TUTORIALS_CHAPTER6 "Compile chapter 6" ON)
+option(TUTORIALS_CHAPTER7 "Compile chapter 7" ON)
 
 # Store location of tutorial/shared directory
 set(TUTORIAL_SHARED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/shared CACHE PATH "location of shared tutorial resources")