catchorg#926 Remove Conan test_package from root dir

- Test package can moved to insternal conan dir - Fix sources required for Catch2 build Signed-off-by: Uilian Ries <uilianries@gmail.com>
uilianries · Nov 16, 2018 · 7a6b239 · 7a6b239
1 parent 33f5aac
commit 7a6b239
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 50 deletions.
diff --git a/conanfile.py b/conanfile.py
@@ -10,8 +10,8 @@ class CatchConan(ConanFile):
     url = "https://github.com/catchorg/Catch2"
     license = "BSL-1.0"
     exports = "LICENSE.txt"
+    exports_sources = ("single_include/*", "CMakeLists.txt", "CMake/*", "contrib/*")
     generators = "cmake"
-    exports_sources = "single_include/*", "CMakeLists.txt", "CMake/catch2.pc.in"
 
     def package(self):
         cmake = CMake(self)

diff --git a/test_package/CMakeLists.txt b/test_package/CMakeLists.txt
diff --git a/test_package/MainTest.cpp b/test_package/MainTest.cpp
diff --git a/test_package/conanfile.py b/test_package/conanfile.py