Quellcode durchsuchen

fix for header_only compilation without MOSEK

Former-commit-id: a055c8f2ae36a48324de9148abd4b0889e369651
Daniele Panozzo vor 11 Jahren
Ursprung
Commit
baeee54740
3 geänderte Dateien mit 12 neuen und 7 gelöschten Zeilen
  1. 0 3
      tutorial/CMakeLists.shared
  2. 3 3
      tutorial/CMakeLists.txt
  3. 9 1
      tutorial/cmake/FindLIBIGL.cmake

+ 0 - 3
tutorial/CMakeLists.shared

@@ -10,9 +10,6 @@ set(CMAKE_COLOR_MAKEFILE ON)
 find_package(ANTTWEAKBAR REQUIRED)
 find_package(OpenGL REQUIRED)
 find_package(EIGEN REQUIRED)
-# Mosek is not required but must be found before libigl to ensure correct flags
-# are set
-find_package(Mosek)
 find_package(LIBIGL REQUIRED)
 find_package(GLFW REQUIRED)
 

+ 3 - 3
tutorial/CMakeLists.txt

@@ -38,9 +38,9 @@ add_subdirectory("304_LinearEqualityConstraints")
 add_subdirectory("305_QuadraticProgramming")
 
 # Chapter 4
-#add_subdirectory("401_BiharmonicDeformation")
-#add_subdirectory("402_PolyharmonicDeformation")
-#add_subdirectory("403_BoundedBiharmonicWeights")
+add_subdirectory("401_BiharmonicDeformation")
+add_subdirectory("402_PolyharmonicDeformation")
+add_subdirectory("403_BoundedBiharmonicWeights")
 
 # Chapter 5
 add_subdirectory("501_HarmonicParam")

+ 9 - 1
tutorial/cmake/FindLIBIGL.cmake

@@ -5,6 +5,10 @@
 #  LIBIGL_INCLUDE_DIR - the LIBIGL include directory
 #  LIBIGL_SOURCES - the LIBIGL source files
 
+# Mosek is not required but must be found before libigl to ensure correct flags
+# are set
+find_package(Mosek QUIET)
+
 FIND_PATH(LIBIGL_INCLUDE_DIR igl/readOBJ.h
    /usr/include
    /usr/local/include
@@ -25,9 +29,13 @@ if(LIBIGL_INCLUDE_DIR)
    #)
 endif(LIBIGL_INCLUDE_DIR)
 
+if (NOT MOSEK_FOUND)
+  add_definitions(-DIGL_NO_MOSEK)
+endif (NOT MOSEK_FOUND)
+
 if(LIBIGL_USE_STATIC_LIBRARY)
   add_definitions(-DIGL_STATIC_LIBRARY)
-  set(LIBIGL_LIB_DIRS 
+  set(LIBIGL_LIB_DIRS
    /usr/lib
    /usr/local/lib
    $ENV{LIBIGLROOT}/lib