|
@@ -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()
|
|
|
|