Răsfoiți Sursa

Revert some commits to tidy the pull request

Former-commit-id: a64a070eccb4a0de05370ee6e942fff77dd26948
Wesley Ranger 7 ani în urmă
părinte
comite
8d96292e64
2 a modificat fișierele cu 8 adăugiri și 22 ștergeri
  1. 8 18
      shared/cmake/libigl.cmake
  2. 0 4
      tutorial/609_Boolean/main.cpp

+ 8 - 18
shared/cmake/libigl.cmake

@@ -143,9 +143,7 @@ if(LIBIGL_WITH_CGAL)
       set(Boost_USE_STATIC_LIBS ON) # Favor static Boost libs on Windows
     endif()
     target_include_directories(igl_cgal ${IGL_SCOPE} "${GMP_INCLUDE_DIR}" "${MPFR_INCLUDE_DIR}")
-    if(NOT (Boost_THREAD_FOUND AND Boost_SYSTEM_FOUND))
-      find_package(Boost 1.48 REQUIRED thread system)
-    endif(NOT (Boost_THREAD_FOUND AND Boost_SYSTEM_FOUND))
+    find_package(Boost 1.48 REQUIRED thread system)
     target_include_directories(igl_cgal ${IGL_SCOPE} ${CGAL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
     target_link_libraries(igl_cgal ${IGL_SCOPE} CGAL::CGAL CGAL::CGAL_Core ${Boost_LIBRARIES})
   else()
@@ -315,22 +313,14 @@ if(LIBIGL_WITH_OPENGL)
   # GLFW module
   if(LIBIGL_WITH_OPENGL_GLFW)
     compile_igl_module("opengl/glfw")
-    if(CMAKE_GENERATOR STREQUAL Xcode)
-      message(STATUS "Using MacOS & XCode, you have to build/install glfw3 mannually.")
-      message(STATUS "e.g. \'brew install glfw\'")
-      find_package(glfw3 3.2 REQUIRED)
-      message(STATUS "Using the GLFW installation at ${glfw3_DIR}")
-    else()
-      if(NOT TARGET glfw)
-        set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL " " FORCE)
-        set(GLFW_BUILD_TESTS OFF CACHE BOOL " " FORCE)
-        set(GLFW_BUILD_DOCS OFF CACHE BOOL " " FORCE)
-        set(GLFW_INSTALL OFF CACHE BOOL " " FORCE)
-        add_subdirectory(${NANOGUI_DIR}/ext/glfw glfw)
-      endif()
-      target_include_directories(glfw ${IGL_SCOPE} ${NANOGUI_DIR}/ext/glfw/include)
+    if(NOT TARGET glfw)
+      set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL " " FORCE)
+      set(GLFW_BUILD_TESTS OFF CACHE BOOL " " FORCE)
+      set(GLFW_BUILD_DOCS OFF CACHE BOOL " " FORCE)
+      set(GLFW_INSTALL OFF CACHE BOOL " " FORCE)
+      add_subdirectory(${NANOGUI_DIR}/ext/glfw glfw)
     endif()
-    
+    target_include_directories(glfw ${IGL_SCOPE} ${NANOGUI_DIR}/ext/glfw/include)
     target_link_libraries(igl_opengl_glfw ${IGL_SCOPE} igl_opengl glfw)
   endif()
 

+ 0 - 4
tutorial/609_Boolean/main.cpp

@@ -77,10 +77,6 @@ int main(int argc, char *argv[])
   using namespace std;
   igl::readOFF(TUTORIAL_SHARED_PATH "/cheburashka.off",VA,FA);
   igl::readOFF(TUTORIAL_SHARED_PATH "/decimated-knight.off",VB,FB);
-  
-  std::cout << "Mosel A: " << FA.rows() << " Triangles" << std::endl
-	  << "Mosel B: " << FB.rows() << " Triangles" << std::endl;
-
   // Plot the mesh with pseudocolors
   igl::viewer::Viewer viewer;