Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

# C++ files want tab indentation
# SQL files want space indentation
[*.sql]
indent_style = space
indent_size = 2

# C++ files want tab indentation
# C++ files want space indentation
[*.{c,h,cpp,hpp,inl}]
indent_style = space
indent_size = 2
indent_size = 4

# Makefiles want tab indentation
[Makefile]
Expand Down
4 changes: 1 addition & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ add_definitions(-DPROJECT_VERSION="v${PROJECT_VERSION}${PROJECT_VERSION_DEV}")
set(PROJECT_LIB_NAME "${PROJECT_NAME_LOWER}-${PROJECT_LIB_VERSION}")




#=============================================
# Set the working directories
#=============================================
Expand Down Expand Up @@ -297,7 +295,7 @@ endif()

message(STATUS "VROOM_INSTALL_PATH ${VROOM_INSTALL_PATH}")

include_directories(${VROOM_INSTALL_PATH}/src)
include_directories(SYSTEM ${VROOM_INSTALL_PATH}/src)
link_libraries(${VROOM_INSTALL_PATH}/lib/libvroom.a)
link_libraries(glpk)

Expand Down
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on Github.

* Renamed files to be compiled as C++ with .hpp & .cpp extensions
* Moved sphinx doc from .c files .rst files
* removing prefix `pgr_` & addding `namespace vrprouting`


**Documentation queries**
Expand Down
43 changes: 42 additions & 1 deletion doc/_static/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,46 @@ div.content-wrapper {
}

div.topic {
border: none;
border: none;
}

p.admonition-title {
font-weight: bold;
background-color: aqua;
border: #000000;
}

.alert-warning {
color: #333;
}

.alert-info {
color: #333;
}

div.note {
background-color: white;
background-image: none;
}

div.warning {
background-color: white;
background-image: none;
}

div.signatures {
font-family: Menlo,Monaco,Consolas,"Courier New",monospace;
background-image: none;
background-color: #f5f5f5;
border: 1px solid #ccc;
color: #333;
font-size: 13px;
word-break: keep-all;
hyphens: none;
}

code.literal {
color: #404040;
background-color: #e8e8e8;
font-size: 100%
}
1 change: 1 addition & 0 deletions doc/general/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ on Github.

* Renamed files to be compiled as C++ with .hpp & .cpp extensions
* Moved sphinx doc from .c files .rst files
* removing prefix `pgr_` & addding `namespace vrprouting`


.. rubric:: Documentation queries
Expand Down
Loading