From 2f31f9037d1139511fa6c5b73fc45698c5783c9e Mon Sep 17 00:00:00 2001 From: Alexandr Timofeev Date: Sat, 31 Oct 2020 20:58:57 +0300 Subject: [PATCH] Inject conan_basic_setup to properly set MD/MT flags --- conanfile.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 3a1bf224..d3fa47ef 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from conans import ConanFile, CMake +from conans import ConanFile, CMake, tools class CatchConan(ConanFile): @@ -18,6 +18,8 @@ class CatchConan(ConanFile): options = {"with_main": [True, False]} default_options = {"with_main": True} + generators = "cmake" + def _configure_cmake(self): cmake = CMake(self) cmake.definitions["BUILD_TESTING"] = "OFF" @@ -27,6 +29,12 @@ class CatchConan(ConanFile): return cmake def build(self): + line_to_replace = 'list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake")' + tools.replace_in_file("CMakeLists.txt", line_to_replace, + '''{} +include({}/conanbuildinfo.cmake) +conan_basic_setup()'''.format(line_to_replace, self.install_folder)) + cmake = self._configure_cmake() cmake.build()