Browse Source

compiling on dgp linux server

Former-commit-id: 5585695fe28cd63ace6a7b30e01b7e1a0987855b
Alec Jacobson 8 years ago
parent
commit
ab7ccca931

+ 10 - 7
shared/cmake/CMakeLists.txt

@@ -326,17 +326,20 @@ if(LIBIGL_WITH_OPENGL)
   set(LIBIGL_OPENGL_EXTRA_LIBRARIES ${OPENGL_gl_LIBRARY})
   set(LIBIGL_OPENGL_EXTRA_LIBRARIES ${OPENGL_gl_LIBRARY})
   list(APPEND LIBIGL_EXTRA_LIBRARIES ${LIBIGL_OPENGL_EXTRA_LIBRARIES})
   list(APPEND LIBIGL_EXTRA_LIBRARIES ${LIBIGL_OPENGL_EXTRA_LIBRARIES})
 
 
+  ### GLEW for linux and windows
+  if((UNIX AND NOT APPLE) OR WIN32) ### Compile glew if needed
+    set(GLEW_INSTALL OFF CACHE BOOL " " FORCE)
+    add_subdirectory("${NANOGUI_DIR}/ext/glew" "glew")
+  endif()
+  if(NOT APPLE)
+    list(APPEND LIBIGL_INCLUDE_DIRS "${NANOGUI_DIR}/ext/glew/include")
+    list(APPEND LIBIGL_OPENGL_EXTRA_LIBRARIES "glew")
+  endif()
+
   if(LIBIGL_WITH_OPENGL_GLFW)
   if(LIBIGL_WITH_OPENGL_GLFW)
     set(GLFW_INCLUDE_DIRS "${NANOGUI_DIR}/ext/glfw/include")
     set(GLFW_INCLUDE_DIRS "${NANOGUI_DIR}/ext/glfw/include")
-
-    ### GLEW for linux and windows
-    if((UNIX AND NOT APPLE) OR WIN32) ### Compile glew if needed
-      set(GLEW_INSTALL OFF CACHE BOOL " " FORCE)
-      add_subdirectory("${NANOGUI_DIR}/ext/glew" "glew")
-    endif()
     if(NOT APPLE)
     if(NOT APPLE)
       list(APPEND GLFW_INCLUDE_DIRS "${NANOGUI_DIR}/ext/glew/include")
       list(APPEND GLFW_INCLUDE_DIRS "${NANOGUI_DIR}/ext/glew/include")
-      list(APPEND LIBIGL_OPENGL_GLFW_EXTRA_LIBRARIES "glew")
     endif()
     endif()
 
 
     add_subdirectory("${NANOGUI_DIR}/ext/glfw" "glfw")
     add_subdirectory("${NANOGUI_DIR}/ext/glfw" "glfw")

+ 1 - 1
tutorial/511_PolyVectorFieldGeneral/CMakeLists.txt

@@ -5,4 +5,4 @@ add_executable(${PROJECT_NAME}_bin
   main.cpp)
   main.cpp)
 target_include_directories(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_INCLUDE_DIRS})
 target_include_directories(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_INCLUDE_DIRS})
 target_compile_definitions(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_DEFINITIONS})
 target_compile_definitions(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_DEFINITIONS})
-target_link_libraries(${PROJECT_NAME}_bin ${LIBIGL_LIBRARIES} ${LIBIGL_EXTRA_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}_bin ${LIBIGL_LIBRARIES} ${LIBIGL_VIEWER_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_GLFW_EXTRA_LIBRARIES})

+ 1 - 1
tutorial/709_VectorFieldVisualizer/CMakeLists.txt

@@ -5,4 +5,4 @@ add_executable(${PROJECT_NAME}_bin
         main.cpp)
         main.cpp)
 target_include_directories(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_INCLUDE_DIRS})
 target_include_directories(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_INCLUDE_DIRS})
 target_compile_definitions(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_DEFINITIONS})
 target_compile_definitions(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_DEFINITIONS})
-target_link_libraries(${PROJECT_NAME}_bin ${LIBIGL_LIBRARIES} ${LIBIGL_EXTRA_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}_bin ${LIBIGL_LIBRARIES} ${LIBIGL_COMISO_EXTRA_LIBRARIES} ${LIBIGL_VIEWER_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_GLFW_EXTRA_LIBRARIES})

+ 3 - 1
tutorial/CMakeLists.txt

@@ -181,7 +181,9 @@ if(TUTORIALS_CHAPTER7)
   endif()
   endif()
   add_subdirectory("707_SweptVolume")
   add_subdirectory("707_SweptVolume")
   add_subdirectory("708_Picking")
   add_subdirectory("708_Picking")
-  add_subdirectory("709_VectorFieldVisualizer")
+  if(LIBIGL_WITH_COMISO)
+    add_subdirectory("709_VectorFieldVisualizer")
+  endif()
   add_subdirectory("710_SLIM")
   add_subdirectory("710_SLIM")
   add_subdirectory("711_Subdivision")
   add_subdirectory("711_Subdivision")
 endif()
 endif()