Merge branch 'opengisch-sharedlib' into develop

This commit is contained in:
Dennis Luxen
2015-03-31 17:33:36 +02:00
2 changed files with 1 additions and 1 deletions
+1
View File
@@ -45,6 +45,7 @@ cache:
env: env:
- CMAKEOPTIONS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++-4.8" OSRM_PORT=5000 OSRM_TIMEOUT=60 - 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=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: notifications:
slack: mapbox:4A6euphDwfxAQnhLurXbu6A1 slack: mapbox:4A6euphDwfxAQnhLurXbu6A1
irc: irc:
-1
View File
@@ -83,7 +83,6 @@ set(
${LibOSRMGlob} ${LibOSRMGlob}
${DescriptorGlob} ${DescriptorGlob}
${DatastructureGlob} ${DatastructureGlob}
${CoordinateGlob}
${AlgorithmGlob} ${AlgorithmGlob}
${HttpGlob} ${HttpGlob}
) )