Skip to content

Updated Googletest submodule and include the P0267 as one #49

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

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

Updated Googletest submodule and include the P0267 as one #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec9866d
Updated Googletest submodule and include the P0267 as one
fdiniello-nobleo Dec 13, 2022
fcff5d1
Update README.md
fdiniello Dec 13, 2022
332273d
Update CMakeLists.txt
fdiniello Dec 13, 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
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
[submodule "thirdparty/googletest"]
path = thirdparty/googletest
url = https://github.com/abseil/googletest.git
[submodule "thirdparty/P0267_RefImpl"]
path = thirdparty/P0267_RefImpl
url = https://github.com/cpp-io2d/P0267_RefImpl
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ project(OSM_A_star_search)
set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/lib")

# Locate project prerequisites
find_package(io2d REQUIRED)
find_package(Cairo)
find_package(GraphicsMagick)

Expand All @@ -21,14 +20,15 @@ set(IO2D_WITHOUT_SAMPLES 1)
set(IO2D_WITHOUT_TESTS 1)

# Add the pugixml and GoogleTest library subdirectories
add_subdirectory(thirdparty/P0267_RefImpl)
add_subdirectory(thirdparty/pugixml)
add_subdirectory(thirdparty/googletest)

# Add project executable
add_executable(OSM_A_star_search src/main.cpp src/model.cpp src/render.cpp src/route_model.cpp src/route_planner.cpp)

target_link_libraries(OSM_A_star_search
PRIVATE io2d::io2d
PRIVATE io2d
PUBLIC pugixml
)

Expand Down
4 changes: 0 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ git clone [email protected]:udacity/CppND-Route-Planning-Project.git --recurse-subm
* Linux: gcc / g++ is installed by default on most Linux distros
* Mac: same instructions as make - [install Xcode command line tools](https://developer.apple.com/xcode/features/)
* Windows: recommend using [MinGW](http://www.mingw.org/)
* IO2D
* Installation instructions for all operating systems can be found [here](https://github.com/cpp-io2d/P0267_RefImpl/blob/master/BUILDING.md)
* This library must be built in a place where CMake `find_package` will be able to find it


## Compiling and Running

Expand Down
1 change: 1 addition & 0 deletions thirdparty/P0267_RefImpl
Open in desktop
Submodule P0267_RefImpl added at caa0ba
2 changes: 1 addition & 1 deletion thirdparty/googletest
Open in desktop
Submodule googletest updated from 695cf7 to e38ef3