From cbb02fd3ce32c11251f02d678eddc0a8d178583b Mon Sep 17 00:00:00 2001 From: manuelk Date: Thu, 11 Dec 2014 10:14:46 -0800 Subject: [PATCH] Fix tutorial include paths - now prettier with prefix --- tutorials/CMakeLists.txt | 5 +++++ tutorials/far/tutorial_0/CMakeLists.txt | 2 -- tutorials/far/tutorial_0/far_tutorial_0.cpp | 2 +- tutorials/far/tutorial_1/CMakeLists.txt | 2 -- tutorials/far/tutorial_1/far_tutorial_1.cpp | 3 +-- tutorials/far/tutorial_1/hbr_to_vtr.h | 2 +- tutorials/far/tutorial_2/CMakeLists.txt | 2 -- tutorials/far/tutorial_2/far_tutorial_2.cpp | 2 +- tutorials/far/tutorial_3/CMakeLists.txt | 2 -- tutorials/far/tutorial_3/far_tutorial_3.cpp | 2 +- tutorials/far/tutorial_4/CMakeLists.txt | 2 -- tutorials/far/tutorial_4/far_tutorial_4.cpp | 6 +++--- tutorials/far/tutorial_5/CMakeLists.txt | 2 -- tutorials/far/tutorial_5/far_tutorial_5.cpp | 6 +++--- tutorials/far/tutorial_6/CMakeLists.txt | 2 -- tutorials/far/tutorial_6/far_tutorial_6.cpp | 6 +++--- tutorials/far/tutorial_7/CMakeLists.txt | 2 -- tutorials/far/tutorial_7/far_tutorial_7.cpp | 6 +++--- tutorials/hbr/tutorial_0/CMakeLists.txt | 2 -- tutorials/hbr/tutorial_0/hbr_tutorial_0.cpp | 4 ++-- tutorials/hbr/tutorial_1/CMakeLists.txt | 2 -- tutorials/hbr/tutorial_1/hbr_tutorial_1.cpp | 4 ++-- tutorials/hbr/tutorial_2/CMakeLists.txt | 2 -- tutorials/hbr/tutorial_2/hbr_tutorial_2.cpp | 4 ++-- tutorials/osd/tutorial_0/CMakeLists.txt | 2 -- tutorials/osd/tutorial_0/osd_tutorial_0.cpp | 10 +++++----- 26 files changed, 33 insertions(+), 53 deletions(-) diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt index 885f6fd8..8bd023b9 100644 --- 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) diff --git a/tutorials/far/tutorial_0/CMakeLists.txt b/tutorials/far/tutorial_0/CMakeLists.txt index 5bf6698e..dd84cdb7 100644 --- 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 ) diff --git a/tutorials/far/tutorial_0/far_tutorial_0.cpp b/tutorials/far/tutorial_0/far_tutorial_0.cpp index 3125bd1a..9ded3f4c 100644 --- 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 +#include #include diff --git a/tutorials/far/tutorial_1/CMakeLists.txt b/tutorials/far/tutorial_1/CMakeLists.txt index 391d428c..db42d3ce 100644 --- 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 ) diff --git a/tutorials/far/tutorial_1/far_tutorial_1.cpp b/tutorials/far/tutorial_1/far_tutorial_1.cpp index 886c1b65..5583e443 100644 --- a/tutorials/far/tutorial_1/far_tutorial_1.cpp +++ b/tutorials/far/tutorial_1/far_tutorial_1.cpp @@ -42,8 +42,7 @@ // -#include -#include +#include //------------------------------------------------------------------------------ diff --git a/tutorials/far/tutorial_1/hbr_to_vtr.h b/tutorials/far/tutorial_1/hbr_to_vtr.h index e2b5f489..1b253328 100644 --- a/tutorials/far/tutorial_1/hbr_to_vtr.h +++ b/tutorials/far/tutorial_1/hbr_to_vtr.h @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include diff --git a/tutorials/far/tutorial_2/CMakeLists.txt b/tutorials/far/tutorial_2/CMakeLists.txt index 35ea1632..263134d7 100644 --- 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 ) diff --git a/tutorials/far/tutorial_2/far_tutorial_2.cpp b/tutorials/far/tutorial_2/far_tutorial_2.cpp index e4822234..babfa3db 100644 --- a/tutorials/far/tutorial_2/far_tutorial_2.cpp +++ b/tutorials/far/tutorial_2/far_tutorial_2.cpp @@ -31,7 +31,7 @@ // data. // -#include +#include #include diff --git a/tutorials/far/tutorial_3/CMakeLists.txt b/tutorials/far/tutorial_3/CMakeLists.txt index 56903e81..4fe6d8c9 100644 --- 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 ) diff --git a/tutorials/far/tutorial_3/far_tutorial_3.cpp b/tutorials/far/tutorial_3/far_tutorial_3.cpp index e1da3d28..766dcac5 100644 --- 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 +#include #include diff --git a/tutorials/far/tutorial_4/CMakeLists.txt b/tutorials/far/tutorial_4/CMakeLists.txt index 2f7c286a..a3652a59 100644 --- 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 ) diff --git a/tutorials/far/tutorial_4/far_tutorial_4.cpp b/tutorials/far/tutorial_4/far_tutorial_4.cpp index a7c611ed..a264c4aa 100644 --- 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 -#include -#include +#include +#include +#include #include #include diff --git a/tutorials/far/tutorial_5/CMakeLists.txt b/tutorials/far/tutorial_5/CMakeLists.txt index 010fe4d4..1b9c5719 100644 --- 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 ) diff --git a/tutorials/far/tutorial_5/far_tutorial_5.cpp b/tutorials/far/tutorial_5/far_tutorial_5.cpp index aa053e10..85228f7c 100644 --- 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 -#include -#include +#include +#include +#include #include #include diff --git a/tutorials/far/tutorial_6/CMakeLists.txt b/tutorials/far/tutorial_6/CMakeLists.txt index f2fa7860..b0a7d479 100644 --- 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 ) diff --git a/tutorials/far/tutorial_6/far_tutorial_6.cpp b/tutorials/far/tutorial_6/far_tutorial_6.cpp index 1e2a850c..e2e88480 100644 --- 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 -#include -#include +#include +#include +#include #include #include diff --git a/tutorials/far/tutorial_7/CMakeLists.txt b/tutorials/far/tutorial_7/CMakeLists.txt index ab3b31e1..81f93bff 100644 --- 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 ) diff --git a/tutorials/far/tutorial_7/far_tutorial_7.cpp b/tutorials/far/tutorial_7/far_tutorial_7.cpp index 853dae86..4568ff4d 100644 --- 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 -#include -#include +#include +#include +#include #include #include diff --git a/tutorials/hbr/tutorial_0/CMakeLists.txt b/tutorials/hbr/tutorial_0/CMakeLists.txt index e31e022c..111ccf22 100644 --- 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 ) diff --git a/tutorials/hbr/tutorial_0/hbr_tutorial_0.cpp b/tutorials/hbr/tutorial_0/hbr_tutorial_0.cpp index 709feb3a..00d07bf9 100644 --- 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 -#include +#include +#include #include diff --git a/tutorials/hbr/tutorial_1/CMakeLists.txt b/tutorials/hbr/tutorial_1/CMakeLists.txt index 874e64e9..00b4cabf 100644 --- 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 ) diff --git a/tutorials/hbr/tutorial_1/hbr_tutorial_1.cpp b/tutorials/hbr/tutorial_1/hbr_tutorial_1.cpp index 02fb3c94..138fd747 100644 --- a/tutorials/hbr/tutorial_1/hbr_tutorial_1.cpp +++ b/tutorials/hbr/tutorial_1/hbr_tutorial_1.cpp @@ -33,8 +33,8 @@ // topology. // -#include -#include +#include +#include #include diff --git a/tutorials/hbr/tutorial_2/CMakeLists.txt b/tutorials/hbr/tutorial_2/CMakeLists.txt index 9abd868c..2c5d7440 100644 --- 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 ) diff --git a/tutorials/hbr/tutorial_2/hbr_tutorial_2.cpp b/tutorials/hbr/tutorial_2/hbr_tutorial_2.cpp index 30e2eaca..9502849b 100644 --- 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 -#include +#include +#include #include #include diff --git a/tutorials/osd/tutorial_0/CMakeLists.txt b/tutorials/osd/tutorial_0/CMakeLists.txt index 81435e73..565ece99 100644 --- 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 ) diff --git a/tutorials/osd/tutorial_0/osd_tutorial_0.cpp b/tutorials/osd/tutorial_0/osd_tutorial_0.cpp index f9c889db..11a4ecaf 100644 --- a/tutorials/osd/tutorial_0/osd_tutorial_0.cpp +++ b/tutorials/osd/tutorial_0/osd_tutorial_0.cpp @@ -30,11 +30,11 @@ // 'Controllers'. // -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include