From 6992d1dc49cd250173855353bcfd6a99a2f924d8 Mon Sep 17 00:00:00 2001 From: WGB5445 <919603023@qq.com> Date: Sat, 6 Aug 2022 22:27:31 +0800 Subject: [PATCH 1/2] fix google test --- .../3rd_party/google-test/CMakeLists.txt.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/05-unit-testing/google-test-download/3rd_party/google-test/CMakeLists.txt.in b/05-unit-testing/google-test-download/3rd_party/google-test/CMakeLists.txt.in index 05a5e39c..326987ef 100644 --- a/05-unit-testing/google-test-download/3rd_party/google-test/CMakeLists.txt.in +++ b/05-unit-testing/google-test-download/3rd_party/google-test/CMakeLists.txt.in @@ -9,7 +9,7 @@ include(ExternalProject) # commit after 9469fb687d040b60c8749b7617fee4e77c7f6409 # Note: This is after the release of v1.8 ExternalProject_Add(googletest - URL https://github.com/google/googletest/archive/bfc0ffc8a698072c794ae7299db9cb6866f4c0bc.tar.gz + URL https://github.com/google/googletest/archive/58d77fa8070e8cec2dc1ed015d66b454c8d78850.tar.gz SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build" CONFIGURE_COMMAND "" From f6c87387799bc534344efb159da1cc250df3a0e1 Mon Sep 17 00:00:00 2001 From: WGB5445 <919603023@qq.com> Date: Sat, 6 Aug 2022 23:22:28 +0800 Subject: [PATCH 2/2] fix conan test --- 07-package-management/D-conan/i-basic/conanfile.txt | 2 +- 07-package-management/D-conan/i-basic/run_test.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/07-package-management/D-conan/i-basic/conanfile.txt b/07-package-management/D-conan/i-basic/conanfile.txt index 1ff62aab..985ff416 100644 --- a/07-package-management/D-conan/i-basic/conanfile.txt +++ b/07-package-management/D-conan/i-basic/conanfile.txt @@ -1,5 +1,5 @@ [requires] -fmt/5.3.0@bincrafters/stable +fmt/9.0.0 [generators] cmake diff --git a/07-package-management/D-conan/i-basic/run_test.sh b/07-package-management/D-conan/i-basic/run_test.sh index 777acb2f..75d4bdf9 100755 --- a/07-package-management/D-conan/i-basic/run_test.sh +++ b/07-package-management/D-conan/i-basic/run_test.sh @@ -9,10 +9,10 @@ fi conan profile show default || { conan profile new default --detect } -conan profile update settings.compiler.libcxx=libstdc++11 default +conan profile update settings.compiler.libcxx=libstdc++11 default echo "correct version of cmake" -mkdir -p build && cd build && conan install .. && cmake .. && make +mkdir -p build && cd build && conan install .. --remote=conancenter && cmake .. && make if [ $? -ne 0 ]; then echo "Error running example" exit 1