Browse Source

fix options

Former-commit-id: 8a2d93cf141ae3e0f5086748baa69c179a08625f
Alec Jacobson 6 years ago
parent
commit
7f852d8aee
3 changed files with 9 additions and 8 deletions
  1. 0 1
      CMakeLists.txt
  2. 0 5
      cmake/libigl.cmake
  3. 9 2
      tutorial/CMakeLists.txt

+ 0 - 1
CMakeLists.txt

@@ -28,7 +28,6 @@ option(LIBIGL_WITH_OPENGL_GLFW_IMGUI "Use ImGui"                    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 OpenGL viewer"            ON)
 option(LIBIGL_WITH_XML               "Use XML"                      ON)
 option(LIBIGL_WITH_PYTHON            "Use Python"                   ${LIBIGL_BUILD_PYTHON})
 ### End

+ 0 - 5
cmake/libigl.cmake

@@ -32,15 +32,10 @@ option(LIBIGL_WITH_OPENGL_GLFW_IMGUI "Use ImGui"                    OFF)
 option(LIBIGL_WITH_PNG               "Use PNG"                      OFF)
 option(LIBIGL_WITH_TETGEN            "Use Tetgen"                   OFF)
 option(LIBIGL_WITH_TRIANGLE          "Use Triangle"                 OFF)
-option(LIBIGL_WITH_VIEWER            "Use OpenGL viewer"            OFF)
 option(LIBIGL_WITH_XML               "Use XML"                      OFF)
 option(LIBIGL_WITH_PYTHON            "Use Python"                   OFF)
 option(LIBIGL_WITHOUT_COPYLEFT       "Disable Copyleft libraries"   OFF)
 
-if(LIBIGL_WITH_VIEWER AND (NOT LIBIGL_WITH_OPENGL_GLFW OR NOT LIBIGL_WITH_OPENGL) )
-  message(FATAL_ERROR "LIBIGL_WITH_VIEWER=ON requires LIBIGL_WITH_OPENGL_GLFW=ON and LIBIGL_WITH_OPENGL=ON")
-endif()
-
 ################################################################################
 
 ### Configuration

+ 9 - 2
tutorial/CMakeLists.txt

@@ -40,6 +40,15 @@ target_include_directories(tutorials INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 # Chapter 1
 if(TUTORIALS_CHAPTER1)
   add_subdirectory("101_FileIO")
+endif()
+
+#######################
+if(NOT (LIBIGL_WITH_OPENGL AND LIBIGL_WITH_OPENGL_GLFW) )
+  message(WARNING "Most tutorial executables depend on OpenGL and glfw")
+  return()
+endif()
+
+if(TUTORIALS_CHAPTER1)
   add_subdirectory("102_DrawMesh")
   add_subdirectory("103_Events")
   add_subdirectory("104_Colors")
@@ -142,5 +151,3 @@ if(TUTORIALS_CHAPTER7)
   endif()
   add_subdirectory("715_MeshImplicitFunction")
 endif()
-
-