From 8a23681dfa47ab9607855685bc6897b5880f1dc5 Mon Sep 17 00:00:00 2001 From: Michael Krasnyk Date: Thu, 19 Apr 2018 14:25:28 +0300 Subject: [PATCH] Delete vtzero submodules --- .gitmodules | 0 CMakeLists.txt | 129 ++++++++++++++------------- third_party/vtzero/.gitmodules | 3 - third_party/vtzero/test/mvt-fixtures | 1 - 4 files changed, 67 insertions(+), 66 deletions(-) delete mode 100644 .gitmodules delete mode 100644 third_party/vtzero/.gitmodules delete mode 160000 third_party/vtzero/test/mvt-fixtures diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/CMakeLists.txt b/CMakeLists.txt index 848a4b52665..eaacc660d33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,45 +136,6 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/include/util/version.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/include/util/version.hpp ) -file(GLOB UtilGlob src/util/*.cpp src/util/*/*.cpp) -file(GLOB ExtractorGlob src/extractor/*.cpp src/extractor/*/*.cpp) -file(GLOB GuidanceGlob src/guidance/*.cpp src/extractor/intersection/*.cpp) -file(GLOB PartitionerGlob src/partitioner/*.cpp) -file(GLOB CustomizerGlob src/customize/*.cpp) -file(GLOB ContractorGlob src/contractor/*.cpp) -file(GLOB UpdaterGlob src/updater/*.cpp) -file(GLOB StorageGlob src/storage/*.cpp) -file(GLOB ServerGlob src/server/*.cpp src/server/**/*.cpp) -file(GLOB EngineGlob src/engine/*.cpp src/engine/**/*.cpp) -file(GLOB ErrorcodesGlob src/osrm/errorcodes.cpp) - -add_library(UTIL OBJECT ${UtilGlob}) -add_library(EXTRACTOR OBJECT ${ExtractorGlob}) -add_library(GUIDANCE OBJECT ${GuidanceGlob}) -add_library(PARTITIONER OBJECT ${PartitionerGlob}) -add_library(CUSTOMIZER OBJECT ${CustomizerGlob}) -add_library(CONTRACTOR OBJECT ${ContractorGlob}) -add_library(UPDATER OBJECT ${UpdaterGlob}) -add_library(STORAGE OBJECT ${StorageGlob}) -add_library(ENGINE OBJECT ${EngineGlob}) -add_library(SERVER OBJECT ${ServerGlob}) - -set_target_properties(UTIL PROPERTIES LINKER_LANGUAGE CXX) - -add_executable(osrm-extract src/tools/extract.cpp) -add_executable(osrm-partition src/tools/partition.cpp) -add_executable(osrm-customize src/tools/customize.cpp) -add_executable(osrm-contract src/tools/contract.cpp) -add_executable(osrm-routed src/tools/routed.cpp $ $) -add_executable(osrm-datastore src/tools/store.cpp $ $) -add_library(osrm src/osrm/osrm.cpp $ $ $ $) -add_library(osrm_contract src/osrm/contractor.cpp $ $) -add_library(osrm_extract src/osrm/extractor.cpp $ $ $) -add_library(osrm_guidance $ $) -add_library(osrm_partition src/osrm/partitioner.cpp $ $ $) -add_library(osrm_customize src/osrm/customizer.cpp $ $ $) -add_library(osrm_update $ $ $) -add_library(osrm_store $ $ $) if(ENABLE_GOLD_LINKER) execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE LD_VERSION) @@ -434,8 +395,9 @@ set_target_properties(protozero PROPERTIES INTERFACE_COMPILE_DEFINITIONS "PROTOZERO_STRICT_API") # Disallow deprecated protozero APIs add_library(vtzero INTERFACE IMPORTED) -set_property(TARGET vtzero PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/third_party/vtzero/include") - +set_target_properties(vtzero PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/third_party/vtzero/include" + INTERFACE_LINK_LIBRARIES protozero) # if mason is enabled no find_package calls are made # to ensure that we are only compiling and linking against @@ -610,27 +572,56 @@ endif() add_definitions(${OSRM_DEFINES}) include_directories(SYSTEM ${DEPENDENCIES_INCLUDE_DIRS}) -set(BOOST_BASE_LIBRARIES - ${Boost_DATE_TIME_LIBRARY} - ${Boost_CHRONO_LIBRARY} - ${Boost_FILESYSTEM_LIBRARY} - ${Boost_IOSTREAMS_LIBRARY} - ${Boost_THREAD_LIBRARY} - ${Boost_SYSTEM_LIBRARY}) +file(GLOB UtilGlob src/util/*.cpp src/util/*/*.cpp) +file(GLOB ExtractorGlob src/extractor/*.cpp src/extractor/*/*.cpp) +file(GLOB GuidanceGlob src/guidance/*.cpp src/extractor/intersection/*.cpp) +file(GLOB PartitionerGlob src/partitioner/*.cpp) +file(GLOB CustomizerGlob src/customize/*.cpp) +file(GLOB ContractorGlob src/contractor/*.cpp) +file(GLOB UpdaterGlob src/updater/*.cpp) +file(GLOB StorageGlob src/storage/*.cpp) +file(GLOB ServerGlob src/server/*.cpp src/server/**/*.cpp) +file(GLOB EngineGlob src/engine/*.cpp src/engine/**/*.cpp) +file(GLOB ErrorcodesGlob src/osrm/errorcodes.cpp) -set(BOOST_ENGINE_LIBRARIES - ${Boost_ZLIB_LIBRARY} - ${Boost_REGEX_LIBRARY} - ${BOOST_BASE_LIBRARIES}) +add_library(UTIL OBJECT ${UtilGlob}) +add_library(EXTRACTOR OBJECT ${ExtractorGlob}) +add_library(GUIDANCE OBJECT ${GuidanceGlob}) +add_library(PARTITIONER OBJECT ${PartitionerGlob}) +add_library(CUSTOMIZER OBJECT ${CustomizerGlob}) +add_library(CONTRACTOR OBJECT ${ContractorGlob}) +add_library(UPDATER OBJECT ${UpdaterGlob}) +add_library(STORAGE OBJECT ${StorageGlob}) +add_library(ENGINE OBJECT ${EngineGlob}) +add_library(SERVER OBJECT ${ServerGlob}) -# Binaries -target_link_libraries(osrm-datastore osrm_store ${Boost_PROGRAM_OPTIONS_LIBRARY}) -target_link_libraries(osrm-extract osrm_extract ${Boost_PROGRAM_OPTIONS_LIBRARY}) -target_link_libraries(osrm-partition osrm_partition ${Boost_PROGRAM_OPTIONS_LIBRARY}) -target_link_libraries(osrm-customize osrm_customize ${Boost_PROGRAM_OPTIONS_LIBRARY}) -target_link_libraries(osrm-contract osrm_contract ${Boost_PROGRAM_OPTIONS_LIBRARY}) -target_link_libraries(osrm-routed osrm ${Boost_PROGRAM_OPTIONS_LIBRARY} ${OPTIONAL_SOCKET_LIBS} ${ZLIB_LIBRARY}) +set_target_properties(UTIL PROPERTIES LINKER_LANGUAGE CXX) + +# CMake doesn't allow target_link_libraries(ENGINE vtzero), so propagate definitions explicitly +target_include_directories(ENGINE PRIVATE $) +target_compile_definitions(ENGINE PRIVATE $) + +# Libraries +add_library(osrm src/osrm/osrm.cpp $ $ $ $) +add_library(osrm_contract src/osrm/contractor.cpp $ $) +add_library(osrm_extract src/osrm/extractor.cpp $ $ $) +add_library(osrm_guidance $ $) +add_library(osrm_partition src/osrm/partitioner.cpp $ $ $) +add_library(osrm_customize src/osrm/customizer.cpp $ $ $) +add_library(osrm_update $ $ $) +add_library(osrm_store $ $ $) +set(BOOST_BASE_LIBRARIES + ${Boost_DATE_TIME_LIBRARY} + ${Boost_CHRONO_LIBRARY} + ${Boost_FILESYSTEM_LIBRARY} + ${Boost_IOSTREAMS_LIBRARY} + ${Boost_THREAD_LIBRARY} + ${Boost_SYSTEM_LIBRARY}) +set(BOOST_ENGINE_LIBRARIES + ${Boost_ZLIB_LIBRARY} + ${Boost_REGEX_LIBRARY} + ${BOOST_BASE_LIBRARIES}) set(EXTRACTOR_LIBRARIES ${BZIP2_LIBRARIES} ${Boost_REGEX_LIBRARY} @@ -683,8 +674,7 @@ set(ENGINE_LIBRARIES ${TBB_LIBRARIES} ${MAYBE_RT_LIBRARY} ${MAYBE_COVERAGE_LIBRARIES} - ${ZLIB_LIBRARY} - protozero vtzero) + ${ZLIB_LIBRARY}) set(STORAGE_LIBRARIES ${BOOST_BASE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} @@ -699,7 +689,6 @@ set(UTIL_LIBRARIES ${MAYBE_COVERAGE_LIBRARIES} ${ZLIB_LIBRARY}) -# Libraries target_link_libraries(osrm ${ENGINE_LIBRARIES}) target_link_libraries(osrm_update ${UPDATER_LIBRARIES}) target_link_libraries(osrm_contract ${CONTRACTOR_LIBRARIES} osrm_update osrm_store) @@ -708,6 +697,22 @@ target_link_libraries(osrm_partition ${PARTITIONER_LIBRARIES}) target_link_libraries(osrm_customize ${CUSTOMIZER_LIBRARIES} osrm_update osrm_store) target_link_libraries(osrm_store ${STORAGE_LIBRARIES}) +# Binaries +add_executable(osrm-extract src/tools/extract.cpp) +add_executable(osrm-partition src/tools/partition.cpp) +add_executable(osrm-customize src/tools/customize.cpp) +add_executable(osrm-contract src/tools/contract.cpp) +add_executable(osrm-routed src/tools/routed.cpp $ $) +add_executable(osrm-datastore src/tools/store.cpp $ $) + +target_link_libraries(osrm-datastore osrm_store ${Boost_PROGRAM_OPTIONS_LIBRARY}) +target_link_libraries(osrm-extract osrm_extract ${Boost_PROGRAM_OPTIONS_LIBRARY}) +target_link_libraries(osrm-partition osrm_partition ${Boost_PROGRAM_OPTIONS_LIBRARY}) +target_link_libraries(osrm-customize osrm_customize ${Boost_PROGRAM_OPTIONS_LIBRARY}) +target_link_libraries(osrm-contract osrm_contract ${Boost_PROGRAM_OPTIONS_LIBRARY}) +target_link_libraries(osrm-routed osrm ${Boost_PROGRAM_OPTIONS_LIBRARY} ${OPTIONAL_SOCKET_LIBS} ${ZLIB_LIBRARY}) + + # BUILD_COMPONENTS add_executable(osrm-components src/tools/components.cpp $ $) target_link_libraries(osrm-components ${TBB_LIBRARIES} ${BOOST_BASE_LIBRARIES} ${UTIL_LIBRARIES}) diff --git a/third_party/vtzero/.gitmodules b/third_party/vtzero/.gitmodules deleted file mode 100644 index 6fb530fd58b..00000000000 --- a/third_party/vtzero/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "test/mvt-fixtures"] - path = test/mvt-fixtures - url = https://github.com/mapbox/mvt-fixtures.git diff --git a/third_party/vtzero/test/mvt-fixtures b/third_party/vtzero/test/mvt-fixtures deleted file mode 160000 index 6ff9cefd599..00000000000 --- a/third_party/vtzero/test/mvt-fixtures +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6ff9cefd5996abfdede6375a86bb2238803dabb9