From 150b938b4922ec162bcb593c365e3d3616e0dbd7 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Fri, 3 Feb 2017 15:59:42 -0800 Subject: [build, ios, macos] Simplify version portion of user agent string The X.Y.Z version portion was unreliable, as it pulled from the latest tag regardless of platform. Set version to 0.0.0 and retrieve only the hash, which allows us to drop the node/npm dependency. --- cmake/core.cmake | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'cmake/core.cmake') diff --git a/cmake/core.cmake b/cmake/core.cmake index f893e1571e..59de7708b6 100644 --- a/cmake/core.cmake +++ b/cmake/core.cmake @@ -1,27 +1,7 @@ -set(MBGL_VERSION_DEPS package.json) -if(EXISTS ${CMAKE_SOURCE_DIR}/.git/HEAD) - set(MBGL_VERSION_DEPS ${MBGL_VERSION_DEPS} .git/HEAD) -endif() - -add_custom_command( - OUTPUT ${MBGL_GENERATED}/include/mbgl/util/version.hpp - DEPENDS ${MBGL_VERSION_DEPS} - COMMAND ${NodeJS_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripts/build-version.js ${MBGL_GENERATED} - VERBATIM -) - -add_custom_target(mbgl-headers DEPENDS - ${MBGL_GENERATED}/include/mbgl/util/version.hpp -) - add_library(mbgl-core STATIC ${MBGL_CORE_FILES} ) -add_dependencies(mbgl-core - mbgl-headers -) - target_compile_options(mbgl-core PRIVATE -fPIC PRIVATE -fvisibility-inlines-hidden @@ -30,7 +10,6 @@ target_compile_options(mbgl-core target_include_directories(mbgl-core PUBLIC include PUBLIC src # TODO: make private - PRIVATE ${MBGL_GENERATED}/include ) target_add_mason_package(mbgl-core PUBLIC geometry) -- cgit v1.2.1