Integrate CMake with `<catch2/catch.hpp>` include paths

This also goes for pkg-config installed by our CMake installation.

This includes

* Updating CMake version on Travis
* Adding a `Catch2` subfolder to the `single_include/` folder to
provide this include path both _inside_ the repository, and _outside_.
* Updated examples to build with the new paths
* Other general CMake cleanup

3 files changed, 3 insertions, 3 deletions

diff --git a/scripts/generateSingleHeader.py b/scripts/generateSingleHeader.py
index c3ce1aec..22b882ab 100755
--- a/scripts/generateSingleHeader.py
+++ b/scripts/generateSingleHeader.py
@@ -24,7 +24,7 @@ def generate(v):
 
     seenHeaders = set([])
     rootPath = os.path.join( catchPath, 'include/' )
-    outputPath = os.path.join( catchPath, 'single_include/catch.hpp' )
+    outputPath = os.path.join( catchPath, 'single_include/catch2/catch.hpp' )
 
     globals = {
         'includeImpl' : True,
diff --git a/scripts/releaseCommon.py b/scripts/releaseCommon.py
index 6e44da24..1a8ee2c8 100644
--- a/scripts/releaseCommon.py
+++ b/scripts/releaseCommon.py
@@ -169,7 +169,7 @@ def performUpdates(version):
     import shutil
     for rep in ('automake', 'tap', 'teamcity'):
         sourceFile = os.path.join(catchPath, 'include/reporters/catch_reporter_{}.hpp'.format(rep))
-        destFile = os.path.join(catchPath, 'single_include/catch_reporter_{}.hpp'.format(rep))
+        destFile = os.path.join(catchPath, 'single_include', 'catch2', 'catch_reporter_{}.hpp'.format(rep))
         shutil.copyfile(sourceFile, destFile)
 
     updateReadmeFile(version)
diff --git a/scripts/updateWandbox.py b/scripts/updateWandbox.py
index 5785feb4..564f9489 100644
--- a/scripts/updateWandbox.py
+++ b/scripts/updateWandbox.py
@@ -34,7 +34,7 @@ def uploadFiles():
         'code': main_file,
         'codes': [{
             'file': 'catch.hpp',
-            'code': open(os.path.join(catchPath, 'single_include', 'catch.hpp')).read()
+            'code': open(os.path.join(catchPath, 'single_include', 'catch2', 'catch.hpp')).read()
         }],
         'options': 'c++11,cpp-no-pedantic,boost-nothing',
         'compiler-option-raw': '-DCATCH_CONFIG_FAST_COMPILE',