Forráskód Böngészése

embree static fixed

Former-commit-id: 33c92219e9bc5415130ff3738f603615708e840d
Romain Prévost 9 éve
szülő
commit
999332505b
48 módosított fájl, 59 hozzáadás és 26 törlés
  1. 2 4
      shared/cmake/CMakeLists.txt
  2. 1 0
      tutorial/101_FileIO/CMakeLists.txt
  3. 1 0
      tutorial/102_DrawMesh/CMakeLists.txt
  4. 1 0
      tutorial/103_Events/CMakeLists.txt
  5. 1 0
      tutorial/104_Colors/CMakeLists.txt
  6. 1 0
      tutorial/105_Overlays/CMakeLists.txt
  7. 1 0
      tutorial/106_ViewerMenu/CMakeLists.txt
  8. 1 0
      tutorial/201_Normals/CMakeLists.txt
  9. 1 0
      tutorial/202_GaussianCurvature/CMakeLists.txt
  10. 1 0
      tutorial/203_CurvatureDirections/CMakeLists.txt
  11. 1 0
      tutorial/204_Gradient/CMakeLists.txt
  12. 1 0
      tutorial/205_Laplacian/CMakeLists.txt
  13. 1 0
      tutorial/301_Slice/CMakeLists.txt
  14. 1 0
      tutorial/302_Sort/CMakeLists.txt
  15. 1 0
      tutorial/303_LaplaceEquation/CMakeLists.txt
  16. 1 0
      tutorial/304_LinearEqualityConstraints/CMakeLists.txt
  17. 1 0
      tutorial/305_QuadraticProgramming/CMakeLists.txt
  18. 1 0
      tutorial/306_EigenDecomposition/CMakeLists.txt
  19. 1 0
      tutorial/401_BiharmonicDeformation/CMakeLists.txt
  20. 1 0
      tutorial/402_PolyharmonicDeformation/CMakeLists.txt
  21. 1 0
      tutorial/404_DualQuaternionSkinning/CMakeLists.txt
  22. 1 0
      tutorial/405_AsRigidAsPossible/CMakeLists.txt
  23. 1 0
      tutorial/406_FastAutomaticSkinningTransformations/CMakeLists.txt
  24. 1 0
      tutorial/407_BiharmonicCoordinates/CMakeLists.txt
  25. 1 0
      tutorial/501_HarmonicParam/CMakeLists.txt
  26. 1 0
      tutorial/502_LSCMParam/CMakeLists.txt
  27. 1 0
      tutorial/503_ARAPParam/CMakeLists.txt
  28. 1 0
      tutorial/504_NRosyDesign/CMakeLists.txt
  29. 1 0
      tutorial/505_MIQ/CMakeLists.txt
  30. 1 0
      tutorial/506_FrameField/CMakeLists.txt
  31. 1 0
      tutorial/507_PolyVectorField/CMakeLists.txt
  32. 1 0
      tutorial/508_ConjugateField/CMakeLists.txt
  33. 1 0
      tutorial/509_Planarization/CMakeLists.txt
  34. 1 0
      tutorial/510_Integrable/CMakeLists.txt
  35. 1 0
      tutorial/601_Serialization/CMakeLists.txt
  36. 1 0
      tutorial/602_Matlab/CMakeLists.txt
  37. 1 0
      tutorial/604_Triangle/CMakeLists.txt
  38. 1 0
      tutorial/605_Tetgen/CMakeLists.txt
  39. 1 0
      tutorial/606_AmbientOcclusion/CMakeLists.txt
  40. 3 3
      tutorial/607_Picking/CMakeLists.txt
  41. 1 7
      tutorial/608_LIM/CMakeLists.txt
  42. 3 3
      tutorial/609_Boolean/CMakeLists.txt
  43. 1 0
      tutorial/610_CSGTree/CMakeLists.txt
  44. 3 3
      tutorial/701_Statistics/CMakeLists.txt
  45. 1 0
      tutorial/702_WindingNumber/CMakeLists.txt
  46. 3 3
      tutorial/703_Decimation/CMakeLists.txt
  47. 1 0
      tutorial/704_SignedDistance/CMakeLists.txt
  48. 3 3
      tutorial/705_MarchingCubes/CMakeLists.txt

+ 2 - 4
shared/cmake/CMakeLists.txt

@@ -131,17 +131,15 @@ if(LIBIGL_WITH_EMBREE)
   set(ENABLE_STATIC_LIB ON CACHE BOOL " " FORCE)
   set(ENABLE_INSTALLER OFF CACHE BOOL " " FORCE)
 
-  if(MSVC)
-    set(USE_STATIC_RUNTIME " " OFF CACHE BOOL " " FORCE)
-  endif()
-
   add_subdirectory("${EMBREE_DIR}" "embree")
   list(APPEND LIBIGL_INCLUDE_DIRS "${EMBREE_DIR}/include")
   list(APPEND LIBIGL_EXTRA_LIBRARIES "embree")
+  list(APPEND LIBIGL_DEFINITIONS "-DENABLE_STATIC_LIB")
 
   if(LIBIGL_USE_STATIC_LIBRARY)
     CompileIGL_Module("embree")
     target_include_directories(iglembree PRIVATE ${EMBREE_DIR}/include)
+    target_compile_definitions(iglembree PRIVATE -DENABLE_STATIC_LIB)
   endif()
 endif()
 

+ 1 - 0
tutorial/101_FileIO/CMakeLists.txt

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

+ 1 - 0
tutorial/102_DrawMesh/CMakeLists.txt

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

+ 1 - 0
tutorial/103_Events/CMakeLists.txt

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

+ 1 - 0
tutorial/104_Colors/CMakeLists.txt

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

+ 1 - 0
tutorial/105_Overlays/CMakeLists.txt

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

+ 1 - 0
tutorial/106_ViewerMenu/CMakeLists.txt

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

+ 1 - 0
tutorial/201_Normals/CMakeLists.txt

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

+ 1 - 0
tutorial/202_GaussianCurvature/CMakeLists.txt

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

+ 1 - 0
tutorial/203_CurvatureDirections/CMakeLists.txt

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

+ 1 - 0
tutorial/204_Gradient/CMakeLists.txt

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

+ 1 - 0
tutorial/205_Laplacian/CMakeLists.txt

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

+ 1 - 0
tutorial/301_Slice/CMakeLists.txt

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

+ 1 - 0
tutorial/302_Sort/CMakeLists.txt

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

+ 1 - 0
tutorial/303_LaplaceEquation/CMakeLists.txt

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

+ 1 - 0
tutorial/304_LinearEqualityConstraints/CMakeLists.txt

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

+ 1 - 0
tutorial/305_QuadraticProgramming/CMakeLists.txt

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

+ 1 - 0
tutorial/306_EigenDecomposition/CMakeLists.txt

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

+ 1 - 0
tutorial/401_BiharmonicDeformation/CMakeLists.txt

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

+ 1 - 0
tutorial/402_PolyharmonicDeformation/CMakeLists.txt

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

+ 1 - 0
tutorial/404_DualQuaternionSkinning/CMakeLists.txt

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

+ 1 - 0
tutorial/405_AsRigidAsPossible/CMakeLists.txt

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

+ 1 - 0
tutorial/406_FastAutomaticSkinningTransformations/CMakeLists.txt

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

+ 1 - 0
tutorial/407_BiharmonicCoordinates/CMakeLists.txt

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

+ 1 - 0
tutorial/501_HarmonicParam/CMakeLists.txt

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

+ 1 - 0
tutorial/502_LSCMParam/CMakeLists.txt

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

+ 1 - 0
tutorial/503_ARAPParam/CMakeLists.txt

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

+ 1 - 0
tutorial/504_NRosyDesign/CMakeLists.txt

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

+ 1 - 0
tutorial/505_MIQ/CMakeLists.txt

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

+ 1 - 0
tutorial/506_FrameField/CMakeLists.txt

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

+ 1 - 0
tutorial/507_PolyVectorField/CMakeLists.txt

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

+ 1 - 0
tutorial/508_ConjugateField/CMakeLists.txt

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

+ 1 - 0
tutorial/509_Planarization/CMakeLists.txt

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

+ 1 - 0
tutorial/510_Integrable/CMakeLists.txt

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

+ 1 - 0
tutorial/601_Serialization/CMakeLists.txt

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

+ 1 - 0
tutorial/602_Matlab/CMakeLists.txt

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

+ 1 - 0
tutorial/604_Triangle/CMakeLists.txt

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

+ 1 - 0
tutorial/605_Tetgen/CMakeLists.txt

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

+ 1 - 0
tutorial/606_AmbientOcclusion/CMakeLists.txt

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

+ 3 - 3
tutorial/607_Picking/CMakeLists.txt

@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(607_Picking)
 
-include_directories(${LIBIGL_INCLUDE_DIRS})
 add_executable(${PROJECT_NAME}_bin
-  main.cpp
-${LIBIGL_EXTRA_SOURCES})
+  main.cpp)
+target_include_directories(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_INCLUDE_DIRS})
+target_compile_definitions(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_DEFINITIONS})
 target_link_libraries(${PROJECT_NAME}_bin ${LIBIGL_LIBRARIES} ${LIBIGL_EXTRA_LIBRARIES})

+ 1 - 7
tutorial/608_LIM/CMakeLists.txt

@@ -1,14 +1,8 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(608_LIM)
 
-### OpenMP ###
-find_package(OpenMP)
-if(OPENMP_FOUND AND NOT WIN32)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-endif()
-
 add_executable(${PROJECT_NAME}_bin
   main.cpp)
 target_include_directories(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_INCLUDE_DIRS})
+target_compile_definitions(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_DEFINITIONS})
 target_link_libraries(${PROJECT_NAME}_bin ${LIBIGL_LIBRARIES} ${LIBIGL_EXTRA_LIBRARIES})

+ 3 - 3
tutorial/609_Boolean/CMakeLists.txt

@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(609_Boolean)
 
-include_directories(${LIBIGL_INCLUDE_DIRS})
 add_executable(${PROJECT_NAME}_bin
-  main.cpp
-${LIBIGL_EXTRA_SOURCES})
+  main.cpp)
+target_include_directories(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_INCLUDE_DIRS})
+target_compile_definitions(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_DEFINITIONS})
 target_link_libraries(${PROJECT_NAME}_bin ${LIBIGL_LIBRARIES} ${LIBIGL_EXTRA_LIBRARIES})

+ 1 - 0
tutorial/610_CSGTree/CMakeLists.txt

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

+ 3 - 3
tutorial/701_Statistics/CMakeLists.txt

@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(701_Statistics)
 
-include_directories(${LIBIGL_INCLUDE_DIRS})
 add_executable(${PROJECT_NAME}_bin
-  main.cpp
-${LIBIGL_EXTRA_SOURCES})
+  main.cpp)
+target_include_directories(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_INCLUDE_DIRS})
+target_compile_definitions(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_DEFINITIONS})
 target_link_libraries(${PROJECT_NAME}_bin ${LIBIGL_LIBRARIES} ${LIBIGL_EXTRA_LIBRARIES})

+ 1 - 0
tutorial/702_WindingNumber/CMakeLists.txt

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

+ 3 - 3
tutorial/703_Decimation/CMakeLists.txt

@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(703_Decimation)
 
-include_directories(${LIBIGL_INCLUDE_DIRS})
 add_executable(${PROJECT_NAME}_bin
-  main.cpp
-${LIBIGL_EXTRA_SOURCES})
+  main.cpp)
+target_include_directories(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_INCLUDE_DIRS})
+target_compile_definitions(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_DEFINITIONS})
 target_link_libraries(${PROJECT_NAME}_bin ${LIBIGL_LIBRARIES} ${LIBIGL_EXTRA_LIBRARIES})

+ 1 - 0
tutorial/704_SignedDistance/CMakeLists.txt

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

+ 3 - 3
tutorial/705_MarchingCubes/CMakeLists.txt

@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(705_MarchingCubes)
 
-include_directories(${LIBIGL_INCLUDE_DIRS})
 add_executable(${PROJECT_NAME}_bin
-  main.cpp
-${LIBIGL_EXTRA_SOURCES})
+  main.cpp)
+target_include_directories(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_INCLUDE_DIRS})
+target_compile_definitions(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_DEFINITIONS})
 target_link_libraries(${PROJECT_NAME}_bin ${LIBIGL_LIBRARIES} ${LIBIGL_EXTRA_LIBRARIES})