Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Google test and Conan test #85

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix Google test and Conan test #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6992d1d
fix google test
WGB5445 Aug 6, 2022
f6c8738
fix conan test
WGB5445 Aug 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 05-unit-testing/google-test-download/3rd_party/google-test/CMakeLists.txt.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
Expand Down
2 changes: 1 addition & 1 deletion 07-package-management/D-conan/i-basic/conanfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[requires]
fmt/5.3.0@bincrafters/stable
fmt/9.0.0

[generators]
cmake
4 changes: 2 additions & 2 deletions 07-package-management/D-conan/i-basic/run_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down