Merge pull request #1935 from Minimonium/feature/taocpp-operators-fix…

…-windows-cmake-build
conan-io · Jun 22, 2020 · 9aa07e5 · 9aa07e5
2 parents df1cf5f + d7b9f0f
commit 9aa07e5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/recipes/taocpp-operators/all/conanfile.py b/recipes/taocpp-operators/all/conanfile.py
@@ -10,6 +10,7 @@ class TaoCPPOperatorsConan(ConanFile):
     description = "A highly efficient, move-aware operators library"
     topics = ("cpp", "cpp11", "header-only", "operators")
     no_copy_source = True
+    settings = "os", "compiler", "build_type", "arch"
 
     @property
     def _source_subfolder(self):

diff --git a/recipes/taocpp-operators/all/test_package/example.cpp b/recipes/taocpp-operators/all/test_package/example.cpp
@@ -99,4 +99,4 @@ int main()
     }
 
     return EXIT_SUCCESS;
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -99,4 +99,4 @@ int main() @@
         }
         return EXIT_SUCCESS;
-    }
+    }