Skip to content

Commit 9321db1

Browse files
committed
chore: update conan-recipes on master and README
1 parent 274095f commit 9321db1

File tree

4 files changed

+11
-16
lines changed

4 files changed

+11
-16
lines changed

README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ It contains ShMOLLI implementation as in [this article](https://jcmr-online.biom
1414
| [DOI][doi_link] | [![DOI][doi_badge]][doi_link] |
1515
| [OSX/Linux build - Travis][travis_link] | [![Travis (.org)][travis_badge]][travis_link] |
1616
| [Windows build - AppVeyor][appveyor_link] | [![AppVeyor][appveyor_badge]][appveyor_link] |
17-
| [Code quality - Codacy][codacy_link] | [![Codacy Badge][codacy_badge]][codacy_link] |
1817
| [Test coverage - Codecov][codecov_link] | [![codecov][codecov_badge]][codecov_link] |
1918
| [Downloads][downloads_link] | [![GitHub Releases][downloads_badge]][downloads_link] |
2019

@@ -66,14 +65,9 @@ Please see [contributing.md](contributing.md) and [codeofconduct.md](codeofcondu
6665
[travis_badge]: https://img.shields.io/travis/MRKonrad/tomato/master.svg?style=flat-square
6766
[appveyor_link]: https://ci.appveyor.com/project/MRKonrad/tomato
6867
[appveyor_badge]: https://img.shields.io/appveyor/ci/MRKonrad/tomato/master.svg?style=flat-square
69-
[codacy_link]: https://www.codacy.com/app/MRKonrad/tomato?utm_source=github.com&utm_medium=referral&utm_content=MRKonrad/tomato&utm_campaign=Badge_Grade
70-
[codacy_badge]: https://img.shields.io/codacy/grade/1ca5a2f31ee040cc9258fc5018e51c1e?style=flat-square
7168
[codecov_link]: https://codecov.io/gh/MRKonrad/tomato
7269
[codecov_badge]: https://img.shields.io/codecov/c/github/MRKonrad/tomato.svg?style=flat-square
7370
[downloads_link]: https://github.com/MRKonrad/tomato/releases
7471
[downloads_badge]: https://img.shields.io/github/downloads/MRKonrad/tomato/total.svg?style=flat-square
7572
[doxygen_link]: https://mrkonrad.github.io/tomato/html/md__r_e_a_d_m_e.html
76-
[toamto_docs_link]: https://mrkonrad.github.io/tomato_docs/
77-
78-
conan remove -f tomato
79-
conan create . cvi/production -s compiler.version=10.0 -e tomato:CC="/opt/local/bin/clang-mp-10" -e tomato:CXX="/opt/local/bin/clang++-mp-10" -s build_type=Release
73+
[toamto_docs_link]: https://mrkonrad.github.io/tomato_docs/

conan-recipes/conan-gtest-1.6.0/conanfile.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ def _configure_cmake(self):
2121
cmake = CMake(self)
2222
# TODO: change it in the code as patch
2323
cmake.definitions["CMAKE_CXX_FLAGS"] = "-DGTEST_HAS_TR1_TUPLE=0"
24+
# cmake.definitions["CMAKE_CXX_STANDARD"] = "98"
2425
if self.settings.os == "Windows" and self.settings.get_safe("compiler.runtime"):
2526
cmake.definitions["gtest_force_shared_crt"] = "MD" in str(self.settings.compiler.runtime)
2627
cmake.configure(source_folder=self.name)

conan-recipes/conan-gtest-1.6.0/test_package/test_package.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ class MockExample : public Example
4242

4343
#endif
4444

45-
//TEST(SalutationTest, Static) {
46-
//
47-
//#ifdef WITH_GMOCK
48-
// MockExample m;
49-
//#endif
50-
//
51-
// EXPECT_EQ(string("Hello World!"), Salutation::greet("World"));
52-
//}
45+
TEST(SalutationTest, Static) {
46+
47+
#ifdef WITH_GMOCK
48+
MockExample m;
49+
#endif
50+
51+
EXPECT_EQ(string("Hello World!"), Salutation::greet("World"));
52+
}
5353

5454
#if GTEST_HAS_COMBINE
5555
#include "prime_tables.h"

conan-recipes/conan-vxl-2.0.2/test_package/conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ def imports(self):
2121
self.copy('*.so*', dst='bin', src='lib')
2222

2323
def test(self):
24-
if not tools.cross_building(self.settings):
24+
if not tools.cross_building(self):
2525
os.chdir("bin")
2626
self.run(".%sPackageTest" % os.sep)

0 commit comments

Comments
 (0)