From c2f775fcaa6e1d29494f4ecabaded0f45cc01ed5 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 9 Mar 2015 09:29:22 +0100 Subject: [PATCH 1/2] Add test for building as shared library --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a163e0352..3cc11abe4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,6 +45,7 @@ cache: env: - CMAKEOPTIONS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++-4.8" OSRM_PORT=5000 OSRM_TIMEOUT=60 - CMAKEOPTIONS="-DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=g++-4.8" OSRM_PORT=5010 OSRM_TIMEOUT=60 + - CMAKEOPTIONS="-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_COMPILER=g++-4.8" OSRM_PORT=5010 OSRM_TIMEOUT=60 notifications: slack: mapbox:4A6euphDwfxAQnhLurXbu6A1 irc: From d11c0bbd5c05180af1f22b139eca935a45b3a2c0 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 9 Mar 2015 09:20:30 +0100 Subject: [PATCH 2/2] Do not compile Coordinate sources directly into the OSRM library It is already included in the COORDINATES "OBJECT" target to which the OSRM library is linked. This fixes the possibility to build OSRM as a shared library. --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e6aa034c7..c1d771d03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,7 +83,6 @@ set( ${LibOSRMGlob} ${DescriptorGlob} ${DatastructureGlob} - ${CoordinateGlob} ${AlgorithmGlob} ${HttpGlob} )