catchorg/Catch2
1
0
Fork 1
mirror of https://github.com/catchorg/Catch2.git synced 2025-10-04 19:11:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Martin Hořeňovský
2018-06-11 10:48:10 +02:00
parent 35a57b070f
commit 44722f9ed3
24 changed files with 476 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/releaseCommon.py
View File

@@ -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)