Browse Source

split windows header-only tutorial actions (#2238)

* split windows header-only tutorial actions

* double quote issue?

* split 7 into 8 and 9
Alec Jacobson 2 years ago
parent
commit
7765697eb6

+ 23 - 2
.github/workflows/continuous.yml

@@ -87,13 +87,25 @@ jobs:
   ####################
 
   Windows:
-    name: Windows ${{ fromJSON('["Header-Only", "Static"]')[matrix.build-params.static == 'ON'] }} ${{ matrix.build-params.tutorials == 'ON' && 'tutorial' || ''}} ${{ matrix.build-params.tests == 'ON' && 'tests' || ''}} ${{ matrix.config }}
+    name: Windows ${{ fromJSON('["Header-Only", "Static"]')[matrix.build-params.static == 'ON'] }} ${{ matrix.build-params.tutorials == 'ON' && 'tutorial' || ''}} ${{ matrix.build-params.selected_tutorial != 'NONE' && matrix.build-params.selected_tutorial || '' }} ${{ matrix.build-params.tests == 'ON' && 'tests' || ''}} ${{ matrix.config }}
     runs-on: windows-2022
     strategy:
       fail-fast: false
       matrix:
         config: [Release]
-        build-params: [ {static:  ON, tutorials:  ON, tests:  ON }, {static: OFF, tutorials: OFF, tests:  ON }, {static: OFF, tutorials:  ON, tests: OFF }]
+        build-params: [ 
+        {static:  ON, tutorials:  ON, tests:  ON, selected_tutorial: NONE}, 
+        {static: OFF, tutorials: OFF, tests:  ON, selected_tutorial: NONE}, 
+        {static: OFF, tutorials:  ON, tests: OFF, selected_tutorial: 1},
+        {static: OFF, tutorials:  ON, tests: OFF, selected_tutorial: 2},
+        {static: OFF, tutorials:  ON, tests: OFF, selected_tutorial: 3},
+        {static: OFF, tutorials:  ON, tests: OFF, selected_tutorial: 4},
+        {static: OFF, tutorials:  ON, tests: OFF, selected_tutorial: 5},
+        {static: OFF, tutorials:  ON, tests: OFF, selected_tutorial: 6},
+        {static: OFF, tutorials:  ON, tests: OFF, selected_tutorial: 7},
+        {static: OFF, tutorials:  ON, tests: OFF, selected_tutorial: 8},
+        {static: OFF, tutorials:  ON, tests: OFF, selected_tutorial: 9},
+      ]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v1
@@ -133,6 +145,15 @@ jobs:
             -DLIBIGL_COPYLEFT_CGAL=ON ^
             -DLIBIGL_BUILD_TUTORIALS=${{ matrix.build-params.tutorials }} ^
             -DLIBIGL_BUILD_TESTS=${{ matrix.build-params.tests }} ^
+            -DLIBIGL_TUTORIALS_CHAPTER1=${{ (matrix.build-params.selected_tutorial == 'NONE' || matrix.build-params.selected_tutorial == '1') && 'ON' || 'OFF' }} ^
+            -DLIBIGL_TUTORIALS_CHAPTER2=${{ (matrix.build-params.selected_tutorial == 'NONE' || matrix.build-params.selected_tutorial == '2') && 'ON' || 'OFF' }} ^
+            -DLIBIGL_TUTORIALS_CHAPTER3=${{ (matrix.build-params.selected_tutorial == 'NONE' || matrix.build-params.selected_tutorial == '3') && 'ON' || 'OFF' }} ^
+            -DLIBIGL_TUTORIALS_CHAPTER4=${{ (matrix.build-params.selected_tutorial == 'NONE' || matrix.build-params.selected_tutorial == '4') && 'ON' || 'OFF' }} ^
+            -DLIBIGL_TUTORIALS_CHAPTER5=${{ (matrix.build-params.selected_tutorial == 'NONE' || matrix.build-params.selected_tutorial == '5') && 'ON' || 'OFF' }} ^
+            -DLIBIGL_TUTORIALS_CHAPTER6=${{ (matrix.build-params.selected_tutorial == 'NONE' || matrix.build-params.selected_tutorial == '6') && 'ON' || 'OFF' }} ^
+            -DLIBIGL_TUTORIALS_CHAPTER7=${{ (matrix.build-params.selected_tutorial == 'NONE' || matrix.build-params.selected_tutorial == '7') && 'ON' || 'OFF' }} ^
+            -DLIBIGL_TUTORIALS_CHAPTER8=${{ (matrix.build-params.selected_tutorial == 'NONE' || matrix.build-params.selected_tutorial == '8') && 'ON' || 'OFF' }} ^
+            -DLIBIGL_TUTORIALS_CHAPTER9=${{ (matrix.build-params.selected_tutorial == 'NONE' || matrix.build-params.selected_tutorial == '9') && 'ON' || 'OFF' }} ^
             -B build ^
             -S .
           cmake --build build -j2

+ 0 - 0
tutorial/711_Subdivision/main.cpp → tutorial/801_Subdivision/main.cpp


+ 0 - 0
tutorial/712_DataSmoothing/main.cpp → tutorial/802_DataSmoothing/main.cpp


+ 0 - 0
tutorial/713_ShapeUp/main.cpp → tutorial/803_ShapeUp/main.cpp


+ 0 - 0
tutorial/714_MarchingTets/main.cpp → tutorial/804_MarchingTets/main.cpp


+ 0 - 0
tutorial/715_MeshImplicitFunction/main.cpp → tutorial/805_MeshImplicitFunction/main.cpp


+ 0 - 0
tutorial/716_HeatGeodesics/main.cpp → tutorial/806_HeatGeodesics/main.cpp


+ 0 - 0
tutorial/717_FastWindingNumber/main.cpp → tutorial/807_FastWindingNumber/main.cpp


+ 0 - 0
tutorial/718_IterativeClosestPoint/main.cpp → tutorial/808_IterativeClosestPoint/main.cpp


+ 0 - 0
tutorial/719_ExplodedView/main.cpp → tutorial/809_ExplodedView/main.cpp


+ 0 - 0
tutorial/720_BlueNoise/main.cpp → tutorial/810_BlueNoise/main.cpp


+ 0 - 0
tutorial/721_VectorFieldSmoothing/main.cpp → tutorial/901_VectorFieldSmoothing/main.cpp


+ 0 - 0
tutorial/722_VectorParallelTransport/main.cpp → tutorial/902_VectorParallelTransport/main.cpp


+ 0 - 0
tutorial/723_FastFindSelfIntersections/main.cpp → tutorial/903_FastFindSelfIntersections/main.cpp


+ 0 - 0
tutorial/724_FastFindIntersections/main.cpp → tutorial/904_FastFindIntersections/main.cpp


+ 23 - 15
tutorial/CMakeLists.txt

@@ -6,6 +6,8 @@ option(LIBIGL_TUTORIALS_CHAPTER4 "Compile libigl tutorials chapter 4" ON)
 option(LIBIGL_TUTORIALS_CHAPTER5 "Compile libigl tutorials chapter 5" ON)
 option(LIBIGL_TUTORIALS_CHAPTER6 "Compile libigl tutorials chapter 6" ON)
 option(LIBIGL_TUTORIALS_CHAPTER7 "Compile libigl tutorials chapter 7" ON)
+option(LIBIGL_TUTORIALS_CHAPTER8 "Compile libigl tutorials chapter 8" ON)
+option(LIBIGL_TUTORIALS_CHAPTER9 "Compile libigl tutorials chapter 9" ON)
 
 # Download tutorial data
 include(libigl_tutorial_data)
@@ -103,19 +105,25 @@ if(LIBIGL_TUTORIALS_CHAPTER7)
     igl_add_tutorial(708_Picking igl::glfw)
     igl_add_tutorial(709_SLIM igl::glfw)
     igl_add_tutorial(710_SCAF igl::glfw igl_restricted::triangle)
-    igl_add_tutorial(711_Subdivision igl::glfw)
-    igl_add_tutorial(712_DataSmoothing igl::glfw)
-    igl_add_tutorial(713_ShapeUp igl::glfw)
-    igl_add_tutorial(714_MarchingTets igl::glfw igl_copyleft::tetgen)
-    igl_add_tutorial(715_MeshImplicitFunction igl::glfw igl_copyleft::core)
-    igl_add_tutorial(716_HeatGeodesics igl::glfw)
-    igl_add_tutorial(717_FastWindingNumber igl::glfw igl_copyleft::cgal)
-    igl_copy_dll(717_FastWindingNumber)
-    igl_add_tutorial(718_IterativeClosestPoint igl::glfw)
-    igl_add_tutorial(719_ExplodedView igl::glfw)
-    igl_add_tutorial(720_BlueNoise igl::glfw)
-    igl_add_tutorial(721_VectorFieldSmoothing igl::glfw)
-    igl_add_tutorial(722_VectorParallelTransport igl::glfw)
-    igl_add_tutorial(723_FastFindSelfIntersections igl::imgui igl::glfw)
-    igl_add_tutorial(724_FastFindIntersections igl::imgui igl::glfw)
+endif()
+
+if(LIBIGL_TUTORIALS_CHAPTER8)
+    igl_add_tutorial(801_Subdivision igl::glfw)
+    igl_add_tutorial(802_DataSmoothing igl::glfw)
+    igl_add_tutorial(803_ShapeUp igl::glfw)
+    igl_add_tutorial(804_MarchingTets igl::glfw igl_copyleft::tetgen)
+    igl_add_tutorial(805_MeshImplicitFunction igl::glfw igl_copyleft::core)
+    igl_add_tutorial(806_HeatGeodesics igl::glfw)
+    igl_add_tutorial(807_FastWindingNumber igl::glfw igl_copyleft::cgal)
+    igl_copy_dll(    807_FastWindingNumber)
+    igl_add_tutorial(808_IterativeClosestPoint igl::glfw)
+    igl_add_tutorial(809_ExplodedView igl::glfw)
+    igl_add_tutorial(810_BlueNoise igl::glfw)
+endif()
+
+if(LIBIGL_TUTORIALS_CHAPTER9)
+    igl_add_tutorial(901_VectorFieldSmoothing igl::glfw)
+    igl_add_tutorial(902_VectorParallelTransport igl::glfw)
+    igl_add_tutorial(903_FastFindSelfIntersections igl::imgui igl::glfw)
+    igl_add_tutorial(904_FastFindIntersections igl::imgui igl::glfw)
 endif()