conanfile.py

@@ -10,28 +10,18 @@ class CatchConan(ConanFile):
     homepage = url
     license = "BSL-1.0"
     exports = "LICENSE.txt"
-    exports_sources = ("src/*", "CMakeLists.txt", "CMake/*", "extras/*")
-    settings = "os", "compiler", "build_type", "arch"
+    exports_sources = ("single_include/*", "CMakeLists.txt", "CMake/*", "contrib/*")
     generators = "cmake"
 
-    def _configure_cmake(self):
+    def package(self):
         cmake = CMake(self)
         cmake.definitions["BUILD_TESTING"] = "OFF"
         cmake.definitions["CATCH_INSTALL_DOCS"] = "OFF"
         cmake.definitions["CATCH_INSTALL_HELPERS"] = "ON"
-        cmake.configure(build_folder="build")
-        return cmake
-
-    def build(self):
-        cmake = self._configure_cmake()
-        cmake.build()
-
-    def package(self):
-        self.copy(pattern="LICENSE.txt", dst="licenses")
-        cmake = self._configure_cmake()
+        cmake.configure(build_folder='build')
         cmake.install()
 
-    def package_info(self):
-        self.cpp_info.libs = ['Catch2Main', 'Catch2']
-        self.cpp_info.names["cmake_find_package"] = "Catch2"
-        self.cpp_info.names["cmake_find_package_multi"] = "Catch2"
+        self.copy(pattern="LICENSE.txt", dst="licenses")
+
+    def package_id(self):
+        self.info.header_only()

src/CMakeLists.txt

@@ -115,7 +115,6 @@ set(INTERNAL_HEADERS
     ${SOURCES_DIR}/catch_uncaught_exceptions.h
     ${SOURCES_DIR}/catch_user_interfaces.h
     ${SOURCES_DIR}/catch_version.h
-    ${SOURCES_DIR}/catch_version_macros.hpp
     ${SOURCES_DIR}/catch_wildcard_pattern.h
     ${SOURCES_DIR}/catch_windows_h_proxy.h
     ${SOURCES_DIR}/catch_xmlwriter.h

src/catch2/catch.hpp

@@ -9,7 +9,9 @@
 #ifndef TWOBLUECUBES_CATCH_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_HPP_INCLUDED
 
-#include <catch2/catch_version_macros.hpp>
+#define CATCH_VERSION_MAJOR 2
+#define CATCH_VERSION_MINOR 10
+#define CATCH_VERSION_PATCH 2
 
 #ifdef __clang__
 #    pragma clang system_header

src/catch2/catch_version_macros.hpp

@@ -1,13 +0,0 @@
-/*
- *  Distributed under the Boost Software License, Version 1.0. (See accompanying
- *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef TWOBLUECUBES_CATCH_VERSION_MACROS_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_VERSION_MACROS_HPP_INCLUDED
-
-#define CATCH_VERSION_MAJOR 2
-#define CATCH_VERSION_MINOR 10
-#define CATCH_VERSION_PATCH 2
-
-#endif // TWOBLUECUBES_CATCH_VERSION_MACROS_HPP_INCLUDED

tools/scripts/releaseCommon.py

@@ -10,9 +10,9 @@ import fnmatch
 from scriptCommon import catchPath
 
 versionParser = re.compile( r'(\s*static\sVersion\sversion)\s*\(\s*(.*)\s*,\s*(.*)\s*,\s*(.*)\s*,\s*\"(.*)\"\s*,\s*(.*)\s*\).*' )
-rootPath = os.path.join( catchPath, 'src/catch2' )
-versionPath = os.path.join( rootPath, "catch_version.cpp" )
-definePath = os.path.join(rootPath, 'catch_version_macros.hpp')
+rootPath = os.path.join( catchPath, 'include/' )
+versionPath = os.path.join( rootPath, "internal/catch_version.cpp" )
+definePath = os.path.join(rootPath, 'catch.hpp')
 readmePath = os.path.join( catchPath, "README.md" )
 cmakePath = os.path.join(catchPath, 'CMakeLists.txt')
 
@@ -149,18 +149,18 @@ def performUpdates(version):
     version.updateVersionFile()
     updateVersionDefine(version)
 
-    # import generateSingleHeader
-    # generateSingleHeader.generate(version)
+    import generateSingleHeader
+    generateSingleHeader.generate(version)
 
-    # # Then copy the reporters to single include folder to keep them in sync
-    # # We probably should have some kind of convention to select which reporters need to be copied automagically,
-    # # but this works for now
-    # import shutil
-    # for rep in ('automake', 'tap', 'teamcity', 'sonarqube'):
-    #     sourceFile = os.path.join(catchPath, 'include/reporters/catch_reporter_{}.hpp'.format(rep))
-    #     destFile = os.path.join(catchPath, 'single_include', 'catch2', 'catch_reporter_{}.hpp'.format(rep))
-    #     shutil.copyfile(sourceFile, destFile)
+    # Then copy the reporters to single include folder to keep them in sync
+    # We probably should have some kind of convention to select which reporters need to be copied automagically,
+    # but this works for now
+    import shutil
+    for rep in ('automake', 'tap', 'teamcity', 'sonarqube'):
+        sourceFile = os.path.join(catchPath, 'include/reporters/catch_reporter_{}.hpp'.format(rep))
+        destFile = os.path.join(catchPath, 'single_include', 'catch2', 'catch_reporter_{}.hpp'.format(rep))
+        shutil.copyfile(sourceFile, destFile)
 
-    # updateReadmeFile(version)
+    updateReadmeFile(version)
     updateCmakeFile(version)
     updateDocumentationVersionPlaceholders(version)