瀏覽代碼

Revert to unconditionally adding GLEW on Linux/Windows;
NanoGui doesn't add it like it adds GLFW.


Former-commit-id: 5fe2133c5c543ca6d7123017909a51e9c1eb3b7b

Julian Panetta 8 年之前
父節點
當前提交
8e933d55e5
共有 1 個文件被更改,包括 1 次插入7 次删除
  1. 1 7
      shared/cmake/CMakeLists.txt

+ 1 - 7
shared/cmake/CMakeLists.txt

@@ -328,13 +328,7 @@ if(LIBIGL_WITH_OPENGL)
   ### GLEW for linux and windows
   ### GLEW for linux and windows
   if((UNIX AND NOT APPLE) OR WIN32) ### Compile glew if needed
   if((UNIX AND NOT APPLE) OR WIN32) ### Compile glew if needed
     set(GLEW_INSTALL OFF CACHE BOOL " " FORCE)
     set(GLEW_INSTALL OFF CACHE BOOL " " FORCE)
-
-    # Note: if add_subdirectory("${NANOGUI_DIR}" "nanogui") runs below it will
-    # add GLEW as a side-effect; in this case, CMake will complain about
-    # duplicates if we add them here.
-    if (NOT (LIBIGL_WITH_OPENGL_GLFW AND LIBIGL_WITH_VIEWER AND LIBIGL_WITH_NANOGUI))
-        add_subdirectory("${NANOGUI_DIR}/ext/glew" "glew")
-    endif()
+    add_subdirectory("${NANOGUI_DIR}/ext/glew" "glew")
   endif()
   endif()
   if(NOT APPLE)
   if(NOT APPLE)
     list(APPEND LIBIGL_INCLUDE_DIRS "${NANOGUI_DIR}/ext/glew/include")
     list(APPEND LIBIGL_INCLUDE_DIRS "${NANOGUI_DIR}/ext/glew/include")