Эх сурвалжийг харах

boolean depends on cgal, fixed static build

Former-commit-id: 45d023595ea504d5d9f23be94555bfa8d065c576
Daniele Panozzo 10 жил өмнө
parent
commit
40716b570c

+ 1 - 1
CMakeLists.txt

@@ -143,7 +143,6 @@ if (CGAL_FOUND)
   )
 
 add_library(iglcgal STATIC ${SOURCES_CGAL})
-endif (CGAL_FOUND)
 
 #### Compile the boolean part
 if (NOT CORK_FOUND)
@@ -155,6 +154,7 @@ file(GLOB SOURCES_BOOLEAN
 )
 
 add_library(iglboolean STATIC ${SOURCES_BOOLEAN})
+endif (CGAL_FOUND)
 
 #### Compile the embree part
 if (EMBREE_FOUND)

+ 9 - 0
tutorial/cmake/FindGLFW.cmake

@@ -14,6 +14,9 @@ FIND_PATH(GLFW_INCLUDE_DIR GLFW/glfw3.h
     ${PROJECT_SOURCE_DIR}/../../external/glfw/include
     ${PROJECT_SOURCE_DIR}/../external/glfw/include
     ${PROJECT_SOURCE_DIR}/external/glfw/include
+    ${PROJECT_SOURCE_DIR}/../../libigl/external/glfw/include
+    ${PROJECT_SOURCE_DIR}/../libigl/external/glfw/include
+    ${PROJECT_SOURCE_DIR}/libigl/external/glfw/include
     /usr/local/include
     /usr/X11/include
     /usr/include
@@ -26,9 +29,15 @@ FIND_LIBRARY( GLFW_LIBRARIES NAMES glfw glfw3
     ${PROJECT_SOURCE_DIR}/../../external/glfw/src
     ${PROJECT_SOURCE_DIR}/../external/glfw/src
     ${PROJECT_SOURCE_DIR}/external/glfw/src
+    ${PROJECT_SOURCE_DIR}/../../libigl/external/glfw/src
+    ${PROJECT_SOURCE_DIR}/../libigl/external/glfw/src
+    ${PROJECT_SOURCE_DIR}/libigl/external/glfw/src
     ${PROJECT_SOURCE_DIR}/../../external/glfw/lib/x64
     ${PROJECT_SOURCE_DIR}/../external/glfw/lib/x64
     ${PROJECT_SOURCE_DIR}/external/glfw/lib/x64
+    ${PROJECT_SOURCE_DIR}/../../libigl/external/glfw/lib/x64
+    ${PROJECT_SOURCE_DIR}/../libigl/external/glfw/lib/x64
+    ${PROJECT_SOURCE_DIR}/libigl/external/glfw/lib/x64
     /usr/local
     /usr/X11
     /usr