Browse Source

Re-enable all tutorials.

Former-commit-id: 13d93e8779b3d20a144bc4ec5858e05a4249e0e7
Jérémie Dumas 7 years ago
parent
commit
7110ec2909

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

@@ -2,6 +2,4 @@ cmake_minimum_required(VERSION 2.8.12)
 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_VIEWER_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_GLFW_EXTRA_LIBRARIES} ${LIBIGL_MATLAB_EXTRA_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}_bin igl::core igl::viewer igl::matlab tutorials)

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

@@ -2,6 +2,4 @@ cmake_minimum_required(VERSION 2.8.12)
 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_VIEWER_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_GLFW_EXTRA_LIBRARIES} ${LIBIGL_EMBREE_EXTRA_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}_bin igl::core igl::viewer igl::embree tutorials)

+ 1 - 3
tutorial/706_FacetOrientation/CMakeLists.txt

@@ -2,6 +2,4 @@ cmake_minimum_required(VERSION 2.8.12)
 project(706_FacetOrientation)
 
 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_VIEWER_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_GLFW_EXTRA_LIBRARIES} ${LIBIGL_EMBREE_EXTRA_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}_bin igl::core igl::viewer igl::embree tutorials)

+ 9 - 9
tutorial/CMakeLists.txt

@@ -109,18 +109,18 @@ if(TUTORIALS_CHAPTER6)
   if(LIBIGL_WITH_XML)
     add_subdirectory("601_Serialization")
   endif()
-  # if(LIBIGL_WITH_MATLAB)
-  #   add_subdirectory("602_Matlab")
-  # endif()
+  if(LIBIGL_WITH_MATLAB)
+    add_subdirectory("602_Matlab")
+  endif()
   if(LIBIGL_WITH_TRIANGLE)
     add_subdirectory("604_Triangle")
   endif()
   if(LIBIGL_WITH_TETGEN)
     add_subdirectory("605_Tetgen")
   endif()
-  # if(LIBIGL_WITH_EMBREE)
-  #   add_subdirectory("606_AmbientOcclusion")
-  # endif()
+  if(LIBIGL_WITH_EMBREE)
+    add_subdirectory("606_AmbientOcclusion")
+  endif()
   if(LIBIGL_WITH_PNG)
     add_subdirectory("607_ScreenCapture")
   endif()
@@ -140,9 +140,9 @@ if(TUTORIALS_CHAPTER7)
   add_subdirectory("703_Decimation")
   add_subdirectory("704_SignedDistance")
   add_subdirectory("705_MarchingCubes")
-  # if(LIBIGL_WITH_EMBREE)
-  #   add_subdirectory("706_FacetOrientation")
-  # endif()
+  if(LIBIGL_WITH_EMBREE)
+    add_subdirectory("706_FacetOrientation")
+  endif()
   add_subdirectory("707_SweptVolume")
   add_subdirectory("708_Picking")
   if(LIBIGL_WITH_COMISO)