Skip to content

Fix travis build issue #535

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

Merged
simonfuhrmann merged 7 commits into from
Feb 5, 2021
Merged

Fix travis build issue #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7f9244f
update gtest_path
keineahnung2345 Feb 4, 2021
b70270e
build on this branch
keineahnung2345 Feb 4, 2021
e0bd6cd
Attemp to let "make" works
keineahnung2345 Feb 4, 2021
a78997e
it's actually second level CMakeLists.txt
keineahnung2345 Feb 4, 2021
a827909
update include dir along with updated GTEST_PATH
keineahnung2345 Feb 4, 2021
be533ea
experiment: not replace "$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
keineahnung2345 Feb 4, 2021
22f795d
revert test code
keineahnung2345 Feb 4, 2021
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 .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ addons:
before_script:
- wget https://github.com/google/googletest/archive/master.zip -O /tmp/gtest.zip
- unzip /tmp/gtest.zip
- export GTEST_PATH=$PWD/googletest-master/googletest
- export GTEST_PATH=$PWD/googletest-master
- mkdir $GTEST_PATH/build
- pushd $GTEST_PATH/build
- cmake ..
Expand Down
2 changes: 1 addition & 1 deletion tests/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ vpath libgtest_main.a ${GTEST_PATH}/build/lib
vpath libgtest.a ${GTEST_PATH}/build/lib

SOURCES = $(wildcard math/gtest_*.cc) $(wildcard mve/gtest_*.cc) $(wildcard sfm/gtest_*.cc) $(wildcard util/gtest_*.cc) $(wildcard fssr/gtest_*.cc)
INCLUDES = -I${MVE_ROOT}/libs -I${GTEST_PATH}/include
INCLUDES = -I${MVE_ROOT}/libs -I${GTEST_PATH}/googletest/include
CXXWARNINGS = -Wall -Wextra -pedantic -Wno-sign-compare
CXXFLAGS = -std=c++11 -pthread ${CXXWARNINGS} ${INCLUDES}
LDLIBS += -lpng -ltiff -ljpeg
Expand Down