From 6831e072e4dc1fd83d97ffc46f6e859f9d5c4501 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 11 Nov 2020 14:32:28 +0000
Subject: [PATCH] Moved osgmultiviewpaging to osgcustompager to avoid name
 confusion with new multiview extension example

---
 examples/CMakeLists.txt                                       | 2 +-
 examples/osgcustompager/CMakeLists.txt                        | 4 ++++
 .../osgcustompager.cpp}                                       | 0
 examples/osgmultiviewpaging/CMakeLists.txt                    | 4 ----
 src/osg/CMakeLists.txt                                        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 examples/osgcustompager/CMakeLists.txt
 rename examples/{osgmultiviewpaging/osgmultiviewpaging.cpp => osgcustompager/osgcustompager.cpp} (100%)
 delete mode 100644 examples/osgmultiviewpaging/CMakeLists.txt

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 788e5075f..0cbfa9b7d 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -39,6 +39,7 @@ IF(DYNAMIC_OPENSCENEGRAPH)
     ADD_SUBDIRECTORY(osgcubemap)
     ADD_SUBDIRECTORY(osgdeferred)
     ADD_SUBDIRECTORY(osgcluster)
+    ADD_SUBDIRECTORY(osgcustompager)
     ADD_SUBDIRECTORY(osgdatabaserevisions)
     ADD_SUBDIRECTORY(osgdepthpartition)
     ADD_SUBDIRECTORY(osgdepthpeeling)
@@ -76,7 +77,6 @@ IF(DYNAMIC_OPENSCENEGRAPH)
     ADD_SUBDIRECTORY(osgmultitexture)
     ADD_SUBDIRECTORY(osgmultitexturecontrol)
     ADD_SUBDIRECTORY(osgmultitouch)
-    ADD_SUBDIRECTORY(osgmultiviewpaging)
     ADD_SUBDIRECTORY(osgobjectcache)
     ADD_SUBDIRECTORY(osgoccluder)
     ADD_SUBDIRECTORY(osgocclusionquery)
diff --git a/examples/osgcustompager/CMakeLists.txt b/examples/osgcustompager/CMakeLists.txt
new file mode 100644
index 000000000..7ba227525
--- /dev/null
+++ b/examples/osgcustompager/CMakeLists.txt
@@ -0,0 +1,4 @@
+SET(TARGET_SRC osgcustompager.cpp )
+
+#### end var setup  ###
+SETUP_EXAMPLE(osgcustompager)
diff --git a/examples/osgmultiviewpaging/osgmultiviewpaging.cpp b/examples/osgcustompager/osgcustompager.cpp
similarity index 100%
rename from examples/osgmultiviewpaging/osgmultiviewpaging.cpp
rename to examples/osgcustompager/osgcustompager.cpp
diff --git a/examples/osgmultiviewpaging/CMakeLists.txt b/examples/osgmultiviewpaging/CMakeLists.txt
deleted file mode 100644
index d8d1a8514..000000000
--- a/examples/osgmultiviewpaging/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-SET(TARGET_SRC osgmultiviewpaging.cpp )
-
-#### end var setup  ###
-SETUP_EXAMPLE(osgmultiviewpaging)
diff --git a/src/osg/CMakeLists.txt b/src/osg/CMakeLists.txt
index 31b88cfe0..9deed7af9 100644
--- a/src/osg/CMakeLists.txt
+++ b/src/osg/CMakeLists.txt
@@ -386,7 +386,7 @@ SET(TARGET_SRC
     TexMat.cpp
     Texture1D.cpp
     Texture2DArray.cpp
-	Texture2DMultisampleArray.cpp
+    Texture2DMultisampleArray.cpp
     Texture2D.cpp
     Texture2DMultisample.cpp
     Texture3D.cpp