Prechádzať zdrojové kódy

nanogui is built in the same cmake project

Former-commit-id: 45ce6714099dd732462b6603f7c309583982bcf4
Daniele Panozzo 10 rokov pred
rodič
commit
c4012eae88
2 zmenil súbory, kde vykonal 10 pridanie a 4 odobranie
  1. 3 3
      tutorial/CMakeLists.shared
  2. 7 1
      tutorial/CMakeLists.txt

+ 3 - 3
tutorial/CMakeLists.shared

@@ -26,7 +26,7 @@ set(CMAKE_COLOR_MAKEFILE ON)
 find_package(OpenGL REQUIRED)
 find_package(EIGEN REQUIRED)
 #find_package(LIBIGL REQUIRED)
-find_package(NANOGUI REQUIRED)
+#find_package(NANOGUI REQUIRED)
 find_package(GLFW REQUIRED)
 
 if(NOT APPLE)
@@ -43,7 +43,7 @@ if(UNIX AND NOT APPLE)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx")
 endif(UNIX AND NOT APPLE)
 
-include_directories( ${NANOGUI_INCLUDE_DIRS} )
+#include_directories( ${NANOGUI_INCLUDE_DIRS} )
 
 
 if(NOT APPLE)
@@ -96,7 +96,7 @@ endif(NOT APPLE)
 set(SHARED_LIBRARIES
 #		${LIBIGL_LIBRARIES}
 		${OPENGL_LIBRARIES}
-		${NANOGUI_LIBRARY}
+#		${NANOGUI_LIBRARY}
 		${EIGEN_LIBRARIES}
 		${GLEW_LIBRARIES}
 		${GLFW_LIBRARIES}

+ 7 - 1
tutorial/CMakeLists.txt

@@ -23,9 +23,15 @@ include("CMakeLists.shared")
 
 #Compile libigl
 add_definitions(-DIGL_STATIC_LIBRARY)
-add_subdirectory("../optional" ".")
+add_subdirectory("../optional" "libigl")
 include_directories("../include")
 
+#Compile nanogui
+add_subdirectory("../external/nanogui/" "nanogui")
+include_directories("../external/nanogui/include")
+include_directories("../external/nanogui/ext/nanovg/src")
+list(APPEND SHARED_LIBRARIES "nanogui")
+
 message(STATUS "Linking with: ${LIBIGL_LIBRARIES}")
 list(APPEND SHARED_LIBRARIES ${LIBIGL_LIBRARIES})