Use Conan instead of Mason to install code dependencies #6284

SiarheiFedartsou · 2022-07-20T18:40:55Z

Issue

Migration of CI dependencies(like clang-format) is out of scope of this PR, but seems can be done with a help of Conan too.

Tasklist

CHANGELOG.md entry (How to write a changelog entry)
update relevant Wiki pages
add tests (see testing documentation)
review
adjust for comments
cherry pick to release branch

Requirements / Relations

Link any requirements here. Other pull requests this PR is based on?

SiarheiFedartsou · 2022-07-20T18:44:41Z

CMakeLists.txt

 # to ensure that osrm binaries play well with other binaries like nodejs
 find_package(ZLIB REQUIRED)
 add_dependency_includes(${ZLIB_INCLUDE_DIRS})

-if(NOT WIN32 AND NOT Boost_USE_STATIC_LIBS)


We have this here

osrm-backend/unit_tests/CMakeLists.txt

Line 131 in 06b1b98

add_definitions(-DBOOST_TEST_DYN_LINK)

SiarheiFedartsou · 2022-07-20T18:45:45Z

CMakeLists.txt

@@ -1,5 +1,11 @@
 cmake_minimum_required(VERSION 3.2)

+enable_language(CXX)


Otherwise Conan doesn't work.

The CMake docs say this is the same as using the project() command, which we already do here:

osrm-backend/CMakeLists.txt

Line 78 in 06b1b98

project(OSRM C CXX)

Any idea why Conan specifically needs this?

mjjbell

Thanks for working on this 👍

I think it would be nice to have a separate file for defining the dependency versions and Conan config (also cleaning up the CMake file a bit). What do you think?

mjjbell · 2022-07-20T22:20:23Z

.github/workflows/osrm-backend.yml

@@ -500,7 +502,7 @@ jobs:
 echo "Using ${JOBS} jobs"
 pushd ${OSRM_BUILD_DIR}
 cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
- -DENABLE_MASON=${ENABLE_MASON:-OFF} \
+ -DENABLE_CONAN=${ENABLE_MASON:-OFF} \


s/MASON/CONAN/

mjjbell · 2022-07-20T22:22:37Z

CMakeLists.txt

@@ -1,5 +1,11 @@
 cmake_minimum_required(VERSION 3.2)

+enable_language(CXX)
+enable_language(C)
+if (NOT CMAKE_BUILD_TYPE)


We're already doing this here:

osrm-backend/CMakeLists.txt

Lines 230 to 233 in 06b1b98

if(NOT CMAKE_BUILD_TYPE)

message(STATUS "No build type specified, defaulting to Release")

set(CMAKE_BUILD_TYPE Release)

endif()

mjjbell · 2022-07-20T22:28:50Z

CMakeLists.txt

@@ -1,5 +1,11 @@
 cmake_minimum_required(VERSION 3.2)

+enable_language(CXX)


The CMake docs say this is the same as using the project() command, which we already do here:

osrm-backend/CMakeLists.txt

Line 78 in 06b1b98

project(OSRM C CXX)

Any idea why Conan specifically needs this?

mjjbell · 2022-07-20T22:40:09Z

CMakeLists.txt

- message(WARNING "ENABLE_MASON and ENABLE_LTO/ENABLE_GOLD_LINKER may not work on all linux systems currently")
+# TODO: this was added for Mason, we are not sure if it is true after migration to Conan
+if(UNIX AND NOT APPLE AND ENABLE_CONAN AND (LTO_WORKS OR ENABLE_GOLD_LINKER))
+ message(WARNING "ENABLE_CONAN and ENABLE_LTO/ENABLE_GOLD_LINKER may not work on all linux systems currently")
 message(WARNING "For more details see: https://github.com/Project-OSRM/osrm-backend/issues/3202")


Let's remove the second message as the issue is Mason specific.

mjjbell · 2022-07-20T22:46:23Z

CMakeLists.txt

 # to ensure that osrm binaries play well with other binaries like nodejs
 find_package(ZLIB REQUIRED)
 add_dependency_includes(${ZLIB_INCLUDE_DIRS})

-if(NOT WIN32 AND NOT Boost_USE_STATIC_LIBS)


~~These may still be needed for non-Conan builds?~~

Edit: Ignore, saw your previous comment.

mjjbell · 2022-07-20T22:49:15Z

CMakeLists.txt

@@ -830,7 +795,7 @@ JOIN("-I${DEPENDENCIES_INCLUDE_DIRS}" " -I" PKGCONFIG_OSRM_INCLUDE_FLAGS)
 # Boost uses imported targets, we need to use a generator expression to extract
 # the link libraries to be written to the pkg-config file.
 foreach(engine_lib ${ENGINE_LIBRARIES})
- if("${engine_lib}" MATCHES "^Boost.*")
+ if("${engine_lib}" MATCHES "^Boost.*" OR "${engine_lib}" MATCHES "^CONAN_LIB.*")


What do theCONAN_LIB. targets represent?

It is CMake targets for dependencies defined by Conan, otherwise we have problems with build of example. It tries to find libraries with name like CONAN_LIB::BZip2 and cannot. I guess we had the same issue with Boost in the past.

osrm-backend/example/CMakeLists.txt

Line 34 in 06b1b98

target_link_libraries(osrm-example ${LibOSRM_LIBRARIES} ${LibOSRM_DEPENDENT_LIBRARIES})

I added a comment to make it more clear.

mjjbell

Nice work 👍

Please add a Changelog entry, and then I'll merge.

v5.27.0 - Changes from 5.26.0 - API: - ADDED: Add Flatbuffers support to NodeJS bindings. [Project-OSRM#6338](Project-OSRM#6338) - CHANGED: Add `data_version` field to responses of all services. [Project-OSRM#5387](Project-OSRM#5387) - FIXED: Use Boost.Beast to parse HTTP request. [Project-OSRM#6294](Project-OSRM#6294) - FIXED: Fix inefficient osrm-routed connection handling [Project-OSRM#6113](https://gihub.com/Project-OSRM/osrm-backend/pull/6113) - FIXED: Fix HTTP compression precedence [Project-OSRM#6113](Project-OSRM#6113) - NodeJS: - FIXED: Support `skip_waypoints` in Node bindings [Project-OSRM#6060](Project-OSRM#6060) - Misc: - ADDED: conanbuildinfo.json for easy reading of dependencies [Project-OSRM#6388](Project-OSRM#6388) - CHANGED: Improve performance of JSON rendering. Fix undefined behaviour in JSON numbers formatting. [Project-OSRM#6380](Project-OSRM#6380) - ADDED: Add timestamps for logs. [Project-OSRM#6375](Project-OSRM#6375) - CHANGED: Improve performance of map matching via getPathDistance optimization. [Project-OSRM#6378](Project-OSRM#6378) - CHANGED: Optimize RestrictionParser performance. [Project-OSRM#6344](Project-OSRM#6344) - ADDED: Support floats for speed value in traffic updates CSV. [Project-OSRM#6327](Project-OSRM#6327) - CHANGED: Use Lua 5.4 in Docker image. [Project-OSRM#6346](Project-OSRM#6346) - CHANGED: Remove redundant nullptr check. [Project-OSRM#6326](Project-OSRM#6326) - CHANGED: missing files list is included in exception message. [Project-OSRM#5360](Project-OSRM#5360) - CHANGED: Do not use deprecated Callback::Call overload in Node bindings. [Project-OSRM#6318](Project-OSRM#6318) - FIXED: Fix distance calculation consistency. [Project-OSRM#6315](Project-OSRM#6315) - FIXED: Fix performance issue after migration to sol2 3.3.0. [Project-OSRM#6304](Project-OSRM#6304) - CHANGED: Pass osm_node_ids by reference in osrm::updater::Updater class. [Project-OSRM#6298](Project-OSRM#6298) - FIXED: Fix bug with reading Set values from Lua scripts. [Project-OSRM#6285](Project-OSRM#6285) - FIXED: Bug in bicycle profile that caused exceptions if there is a highway=bicycle in the data. [Project-OSRM#6296](Project-OSRM#6296) - FIXED: Internal refactoring of identifier types used in data facade [Project-OSRM#6044](Project-OSRM#6044) - CHANGED: Update docs to reflect recent build and dependency changes [Project-OSRM#6383](Project-OSRM#6383) - Build: - REMOVED: Get rid of Mason. [Project-OSRM#6387](Project-OSRM#6387) - CHANGED: Use clang-format from CI base image. [Project-OSRM#6391](Project-OSRM#6391) - ADDED: Build Node bindings on Windows. [Project-OSRM#6334](Project-OSRM#6334) - ADDED: Configure cross-compilation for Apple Silicon. [Project-OSRM#6360](Project-OSRM#6360) - CHANGED: Use apt-get to install Clang on CI. [Project-OSRM#6345](Project-OSRM#6345) - CHANGED: Fix TBB in case of Conan + NodeJS build. [Project-OSRM#6333](Project-OSRM#6333) - CHANGED: Migrate to modern TBB version. [Project-OSRM#6300](Project-OSRM#6300) - CHANGED: Enable performance-move-const-arg clang-tidy check. [Project-OSRM#6319](Project-OSRM#6319) - CHANGED: Use the latest node on CI. [Project-OSRM#6317](Project-OSRM#6317) - CHANGED: Migrate Windows CI to GitHub Actions. [Project-OSRM#6312](Project-OSRM#6312) - ADDED: Add smoke test for Docker image. [Project-OSRM#6313](Project-OSRM#6313) - CHANGED: Update libosmium to version 2.18.0. [Project-OSRM#6303](Project-OSRM#6303) - CHANGED: Remove EXACT from find_package if using Conan. [Project-OSRM#6299](Project-OSRM#6299) - CHANGED: Configure Undefined Behaviour Sanitizer. [Project-OSRM#6290](Project-OSRM#6290) - CHANGED: Use Conan instead of Mason to install code dependencies. [Project-OSRM#6284](Project-OSRM#6284) - CHANGED: Migrate to C++17. Update sol2 to 3.3.0. [Project-OSRM#6279](Project-OSRM#6279) - CHANGED: Update macOS CI image to macos-11. [Project-OSRM#6286](Project-OSRM#6286) - CHANGED: Enable even more clang-tidy checks. [Project-OSRM#6273](Project-OSRM#6273) - CHANGED: Configure CMake to not build flatbuffers tests and samples. [Project-OSRM#6274](Project-OSRM#6274) - CHANGED: Enable more clang-tidy checks. [Project-OSRM#6270](Project-OSRM#6270) - CHANGED: Configure clang-tidy job on CI. [Project-OSRM#6261](Project-OSRM#6261) - CHANGED: Use Github Actions for building container images [Project-OSRM#6138](Project-OSRM#6138) - CHANGED: Upgrade Boost dependency to 1.70 [Project-OSRM#6113](Project-OSRM#6113) - CHANGED: Upgrade Ubuntu CI builds to 20.04 [Project-OSRM#6119](Project-OSRM#6119) - CHANGED: Make building osrm-routed optional [Project-OSRM#6144](Project-OSRM#6144) - FIXED: Run all unit tests in CI [Project-OSRM#5248](Project-OSRM#5248) - FIXED: Fix installation of Mason CMake and 32 bit CI build [Project-OSRM#6170](Project-OSRM#6170) - FIXED: Fixed Node docs generation check in CI. [Project-OSRM#6058](Project-OSRM#6058) - CHANGED: Docker build, enabled arm64 build layer [Project-OSRM#6172](Project-OSRM#6172) - CHANGED: Docker build, enabled apt-get update/install caching in separate layer for build phase [Project-OSRM#6175](Project-OSRM#6175) - FIXED: Bump CI complete meta job to ubuntu-20.04 [Project-OSRM#6323](Project-OSRM#6323) - CHANGED: Node packages are now scoped by @Project-OSRM [Project-OSRM#6386](Project-OSRM#6386) - Routing: - CHANGED: Lazily generate optional route path data [Project-OSRM#6045](Project-OSRM#6045) - FIXED: Completed support for no_entry and no_exit turn restrictions. [Project-OSRM#5988](Project-OSRM#5988) - ADDED: Add support for non-round-trips with a single fixed endpoint. [Project-OSRM#6050](Project-OSRM#6050) - FIXED: Improvements to maneuver override processing [Project-OSRM#6125](Project-OSRM#6125) - ADDED: Support snapping to multiple ways at an input location. [Project-OSRM#5953](Project-OSRM#5953) - FIXED: Fix snapping target locations to ways used in turn restrictions. [Project-OSRM#6339](Project-OSRM#6339) - ADDED: Support OSM traffic signal directions. [Project-OSRM#6153](Project-OSRM#6153) - FIXED: Ensure u-turn exists in intersection view. [Project-OSRM#6376](Project-OSRM#6376) - FIXED: Gracefully handle no-turn intersections in guidance processing. [Project-OSRM#6382](Project-OSRM#6382) - Profile: - CHANGED: Bicycle surface speeds [Project-OSRM#6212](Project-OSRM#6212) - Tools: - CHANGED: Do not generate intermediate .osrm file in osrm-extract. [Project-OSRM#6354](Project-OSRM#6354)

…#6284) * Use Conan instead of Mason to install code dependencies

This was referenced Jul 20, 2022

Mason is unmaintained #6266

Closed

Remove Boost.Regex from the list of dependencies #6278

Closed

SiarheiFedartsou commented Jul 20, 2022

View reviewed changes

SiarheiFedartsou marked this pull request as ready for review July 20, 2022 18:46

mjjbell reviewed Jul 20, 2022

View reviewed changes

SiarheiFedartsou requested a review from mjjbell July 23, 2022 11:41

mjjbell approved these changes Jul 31, 2022

View reviewed changes

Use Conan instead of Mason to install code dependencies

f881471

SiarheiFedartsou force-pushed the sf-conan2 branch from fe9aa33 to f881471 Compare August 1, 2022 17:32

Remove redundant changelog comment.

a674d05

mjjbell merged commit 589becb into Project-OSRM:master Aug 1, 2022

SiarheiFedartsou mentioned this pull request Aug 1, 2022

Build process fails for arm-64 #6158

Closed

mattwigway pushed a commit to mattwigway/osrm-backend that referenced this pull request Jul 20, 2023

Use Conan instead of Mason to install code dependencies (Project-OSRM…

80dbfce

…#6284) * Use Conan instead of Mason to install code dependencies

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use Conan instead of Mason to install code dependencies #6284

Use Conan instead of Mason to install code dependencies #6284

SiarheiFedartsou commented Jul 20, 2022 •

edited

Loading

SiarheiFedartsou Jul 20, 2022

SiarheiFedartsou Jul 20, 2022

mjjbell Jul 20, 2022

mjjbell left a comment

mjjbell Jul 20, 2022

mjjbell Jul 20, 2022

mjjbell Jul 20, 2022

mjjbell Jul 20, 2022

mjjbell Jul 20, 2022 •

edited

Loading

mjjbell Jul 20, 2022

SiarheiFedartsou Jul 23, 2022 •

edited

Loading

mjjbell left a comment

		@@ -1,5 +1,11 @@
		cmake_minimum_required(VERSION 3.2)

		enable_language(CXX)

	if(NOT CMAKE_BUILD_TYPE)
	message(STATUS "No build type specified, defaulting to Release")
	set(CMAKE_BUILD_TYPE Release)
	endif()

Use Conan instead of Mason to install code dependencies #6284

Use Conan instead of Mason to install code dependencies #6284

Conversation

SiarheiFedartsou commented Jul 20, 2022 • edited Loading

Issue

Tasklist

Requirements / Relations

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mjjbell left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mjjbell Jul 20, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SiarheiFedartsou Jul 23, 2022 • edited Loading

Choose a reason for hiding this comment

mjjbell left a comment

Choose a reason for hiding this comment

SiarheiFedartsou commented Jul 20, 2022 •

edited

Loading

mjjbell Jul 20, 2022 •

edited

Loading

SiarheiFedartsou Jul 23, 2022 •

edited

Loading