Fix tutorial include paths

- now prettier with <opensubdiv> prefix
2024-12-23 00:10:07 +00:00 · 2014-12-11 10:14:46 -08:00 · 2014-12-11 10:14:46 -08:00 · cbb02fd3ce
commit cbb02fd3ce
parent 81d971966d
26 changed files with 33 additions and 53 deletions
--- a/tutorials/CMakeLists.txt
+++ b/tutorials/CMakeLists.txt
@ -22,6 +22,11 @@
 #   language governing permissions and limitations under the Apache License.
 #

+
+include_directories(
+    "${PROJECT_SOURCE_DIR}/"
+)
+
 add_subdirectory(hbr)

 add_subdirectory(far)
--- a/tutorials/far/tutorial_0/CMakeLists.txt
+++ b/tutorials/far/tutorial_0/CMakeLists.txt
@ -22,8 +22,6 @@
 #   language governing permissions and limitations under the Apache License.
 #

-include_directories("${PROJECT_SOURCE_DIR}/opensubdiv")
-
 set(SOURCE_FILES
    far_tutorial_0.cpp
 )
--- a/tutorials/far/tutorial_0/far_tutorial_0.cpp
+++ b/tutorials/far/tutorial_0/far_tutorial_0.cpp
@ -30,7 +30,7 @@
 // instantiate a Far mesh from simple topological data.
 //

-#include <far/topologyRefinerFactory.h>
+#include <opensubdiv/far/topologyRefinerFactory.h>

 #include <cstdio>

--- a/tutorials/far/tutorial_1/CMakeLists.txt
+++ b/tutorials/far/tutorial_1/CMakeLists.txt
@ -22,8 +22,6 @@
 #   language governing permissions and limitations under the Apache License.
 #

-include_directories("${PROJECT_SOURCE_DIR}/opensubdiv")
-
 set(SOURCE_FILES
    far_tutorial_1.cpp
 )
--- a/tutorials/far/tutorial_1/far_tutorial_1.cpp
+++ b/tutorials/far/tutorial_1/far_tutorial_1.cpp
@ -42,8 +42,7 @@
 //


-#include <sdc/type.h>
-#include <far/topologyRefinerFactory.h>
+#include <opensubdiv/far/topologyRefinerFactory.h>

 //------------------------------------------------------------------------------

--- a/tutorials/far/tutorial_1/hbr_to_vtr.h
+++ b/tutorials/far/tutorial_1/hbr_to_vtr.h
@ -30,7 +30,7 @@
 #include <hbr/cornerEdit.h>
 #include <hbr/holeEdit.h>

-#include <far/topologyRefinerFactory.h>
+#include <opensubdiv/far/topologyRefinerFactory.h>

 #include <typeinfo>
 #include <cassert>
--- a/tutorials/far/tutorial_2/CMakeLists.txt
+++ b/tutorials/far/tutorial_2/CMakeLists.txt
@ -22,8 +22,6 @@
 #   language governing permissions and limitations under the Apache License.
 #

-include_directories("${PROJECT_SOURCE_DIR}/opensubdiv")
-
 set(SOURCE_FILES
    far_tutorial_2.cpp
 )
--- a/tutorials/far/tutorial_2/far_tutorial_2.cpp
+++ b/tutorials/far/tutorial_2/far_tutorial_2.cpp
@ -31,7 +31,7 @@
 // data.
 //

-#include <far/topologyRefinerFactory.h>
+#include <opensubdiv/far/topologyRefinerFactory.h>

 #include <cstdio>

--- a/tutorials/far/tutorial_3/CMakeLists.txt
+++ b/tutorials/far/tutorial_3/CMakeLists.txt
@ -22,8 +22,6 @@
 #   language governing permissions and limitations under the Apache License.
 #

-include_directories("${PROJECT_SOURCE_DIR}/opensubdiv")
-
 set(SOURCE_FILES
    far_tutorial_3.cpp
 )
--- a/tutorials/far/tutorial_3/far_tutorial_3.cpp
+++ b/tutorials/far/tutorial_3/far_tutorial_3.cpp
@ -33,7 +33,7 @@
 // 'face-varying' data recorded in the uv texture layout.
 //

-#include <far/topologyRefinerFactory.h>
+#include <opensubdiv/far/topologyRefinerFactory.h>

 #include <cstdio>

--- a/tutorials/far/tutorial_4/CMakeLists.txt
+++ b/tutorials/far/tutorial_4/CMakeLists.txt
@ -22,8 +22,6 @@
 #   language governing permissions and limitations under the Apache License.
 #

-include_directories("${PROJECT_SOURCE_DIR}/opensubdiv")
-
 set(SOURCE_FILES
    far_tutorial_4.cpp
 )
--- a/tutorials/far/tutorial_4/far_tutorial_4.cpp
+++ b/tutorials/far/tutorial_4/far_tutorial_4.cpp
@ -30,9 +30,9 @@
 // factorized stencils to interpolate vertex primvar data buffers.
 //

-#include <far/topologyRefinerFactory.h>
-#include <far/stencilTables.h>
-#include <far/stencilTablesFactory.h>
+#include <opensubdiv/far/topologyRefinerFactory.h>
+#include <opensubdiv/far/stencilTables.h>
+#include <opensubdiv/far/stencilTablesFactory.h>

 #include <cstdio>
 #include <cstring>
--- a/tutorials/far/tutorial_5/CMakeLists.txt
+++ b/tutorials/far/tutorial_5/CMakeLists.txt
@ -22,8 +22,6 @@
 #   language governing permissions and limitations under the Apache License.
 #

-include_directories("${PROJECT_SOURCE_DIR}/opensubdiv")
-
 set(SOURCE_FILES
    far_tutorial_5.cpp
 )
--- a/tutorials/far/tutorial_5/far_tutorial_5.cpp
+++ b/tutorials/far/tutorial_5/far_tutorial_5.cpp
@ -31,9 +31,9 @@
 // vertex colors.
 //

-#include <far/topologyRefinerFactory.h>
-#include <far/stencilTables.h>
-#include <far/stencilTablesFactory.h>
+#include <opensubdiv/far/topologyRefinerFactory.h>
+#include <opensubdiv/far/stencilTables.h>
+#include <opensubdiv/far/stencilTablesFactory.h>

 #include <cstdio>
 #include <cstring>
--- a/tutorials/far/tutorial_6/CMakeLists.txt
+++ b/tutorials/far/tutorial_6/CMakeLists.txt
@ -22,8 +22,6 @@
 #   language governing permissions and limitations under the Apache License.
 #

-include_directories("${PROJECT_SOURCE_DIR}/opensubdiv")
-
 set(SOURCE_FILES
    far_tutorial_6.cpp
 )
--- a/tutorials/far/tutorial_6/far_tutorial_6.cpp
+++ b/tutorials/far/tutorial_6/far_tutorial_6.cpp
@ -40,9 +40,9 @@
 // systems that show the tangent and bi-tangent at the random samples locations.
 //

-#include <far/topologyRefinerFactory.h>
-#include <far/patchTablesFactory.h>
-#include <far/patchMap.h>
+#include <opensubdiv/far/topologyRefinerFactory.h>
+#include <opensubdiv/far/patchTablesFactory.h>
+#include <opensubdiv/far/patchMap.h>

 #include <cassert>
 #include <cstdio>
--- a/tutorials/far/tutorial_7/CMakeLists.txt
+++ b/tutorials/far/tutorial_7/CMakeLists.txt
@ -22,8 +22,6 @@
 #   language governing permissions and limitations under the Apache License.
 #

-include_directories("${PROJECT_SOURCE_DIR}/opensubdiv")
-
 set(SOURCE_FILES
    far_tutorial_7.cpp
 )
--- a/tutorials/far/tutorial_7/far_tutorial_7.cpp
+++ b/tutorials/far/tutorial_7/far_tutorial_7.cpp
@ -41,9 +41,9 @@
 // of refinement of the original cube.
 //

-#include <far/topologyRefinerFactory.h>
-#include <far/stencilTables.h>
-#include <far/stencilTablesFactory.h>
+#include <opensubdiv/far/topologyRefinerFactory.h>
+#include <opensubdiv/far/stencilTables.h>
+#include <opensubdiv/far/stencilTablesFactory.h>

 #include <cstdio>
 #include <cstring>
--- a/tutorials/hbr/tutorial_0/CMakeLists.txt
+++ b/tutorials/hbr/tutorial_0/CMakeLists.txt
@ -22,8 +22,6 @@
 #   language governing permissions and limitations under the Apache License.
 #

-include_directories("${PROJECT_SOURCE_DIR}/opensubdiv")
-
 set(SOURCE_FILES
    hbr_tutorial_0.cpp
 )
--- a/tutorials/hbr/tutorial_0/hbr_tutorial_0.cpp
+++ b/tutorials/hbr/tutorial_0/hbr_tutorial_0.cpp
@ -30,8 +30,8 @@
 // instantiate an Hbr mesh from simple topological data.
 //

-#include <hbr/mesh.h>
-#include <hbr/catmark.h>
+#include <opensubdiv/hbr/mesh.h>
+#include <opensubdiv/hbr/catmark.h>

 #include <cstdio>

--- a/tutorials/hbr/tutorial_1/CMakeLists.txt
+++ b/tutorials/hbr/tutorial_1/CMakeLists.txt
@ -22,8 +22,6 @@
 #   language governing permissions and limitations under the Apache License.
 #

-include_directories("${PROJECT_SOURCE_DIR}/opensubdiv")
-
 set(SOURCE_FILES
    hbr_tutorial_1.cpp
 )
--- a/tutorials/hbr/tutorial_1/hbr_tutorial_1.cpp
+++ b/tutorials/hbr/tutorial_1/hbr_tutorial_1.cpp
@ -33,8 +33,8 @@
 // topology.
 //

-#include <hbr/mesh.h>
-#include <hbr/catmark.h>
+#include <opensubdiv/hbr/mesh.h>
+#include <opensubdiv/hbr/catmark.h>

 #include <cstdio>

--- a/tutorials/hbr/tutorial_2/CMakeLists.txt
+++ b/tutorials/hbr/tutorial_2/CMakeLists.txt
@ -22,8 +22,6 @@
 #   language governing permissions and limitations under the Apache License.
 #

-include_directories("${PROJECT_SOURCE_DIR}/opensubdiv")
-
 set(SOURCE_FILES
    hbr_tutorial_2.cpp
 )
--- a/tutorials/hbr/tutorial_2/hbr_tutorial_2.cpp
+++ b/tutorials/hbr/tutorial_2/hbr_tutorial_2.cpp
@ -36,8 +36,8 @@
 // is then dumped to the terminal in Wavefront OBJ format for inspection.
 // 

-#include <hbr/mesh.h>
-#include <hbr/catmark.h>
+#include <opensubdiv/hbr/mesh.h>
+#include <opensubdiv/hbr/catmark.h>

 #include <cassert>
 #include <cstdio>
--- a/tutorials/osd/tutorial_0/CMakeLists.txt
+++ b/tutorials/osd/tutorial_0/CMakeLists.txt
@ -22,8 +22,6 @@
 #   language governing permissions and limitations under the Apache License.
 #

-include_directories("${PROJECT_SOURCE_DIR}/opensubdiv")
-
 set(SOURCE_FILES
    osd_tutorial_0.cpp
 )
--- a/tutorials/osd/tutorial_0/osd_tutorial_0.cpp
+++ b/tutorials/osd/tutorial_0/osd_tutorial_0.cpp
@ -30,11 +30,11 @@
 // 'Controllers'.
 //

-#include <far/topologyRefinerFactory.h>
-#include <far/stencilTablesFactory.h>
-#include <osd/cpuComputeContext.h>
-#include <osd/cpuComputeController.h>
-#include <osd/cpuVertexBuffer.h>
+#include <opensubdiv/far/topologyRefinerFactory.h>
+#include <opensubdiv/far/stencilTablesFactory.h>
+#include <opensubdiv/osd/cpuComputeContext.h>
+#include <opensubdiv/osd/cpuComputeController.h>
+#include <opensubdiv/osd/cpuVertexBuffer.h>

 #include <cstdio>
 #include <cstring>