diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-03 15:59:42 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-08 10:59:59 -0600 |
commit | 150b938b4922ec162bcb593c365e3d3616e0dbd7 (patch) | |
tree | edc3cf391f8971e98752fe1c52f8513afeb71cef /cmake | |
parent | d3ca6c67f1b8fbf5d71c307e71ba89a483ec75bc (diff) | |
download | qtlocation-mapboxgl-150b938b4922ec162bcb593c365e3d3616e0dbd7.tar.gz |
[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.
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/core-files.cmake | 3 | ||||
-rw-r--r-- | cmake/core.cmake | 21 | ||||
-rw-r--r-- | cmake/mbgl.cmake | 2 | ||||
-rw-r--r-- | cmake/test.cmake | 1 |
4 files changed, 2 insertions, 25 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index a481249d61..47e486571f 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -519,7 +519,8 @@ set(MBGL_CORE_FILES src/mbgl/util/url.cpp src/mbgl/util/url.hpp src/mbgl/util/utf.hpp - src/mbgl/util/version_info.cpp + src/mbgl/util/version.cpp + src/mbgl/util/version.hpp src/mbgl/util/work_queue.cpp src/mbgl/util/work_queue.hpp src/mbgl/util/work_request.cpp 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) diff --git a/cmake/mbgl.cmake b/cmake/mbgl.cmake index 4002257bb4..ca0487ef34 100644 --- a/cmake/mbgl.cmake +++ b/cmake/mbgl.cmake @@ -10,8 +10,6 @@ if (NOT MASON_PLATFORM) set(MASON_PLATFORM "${MBGL_PLATFORM}") endif() -set(MBGL_GENERATED ${CMAKE_BINARY_DIR}/generated/${CMAKE_CFG_INTDIR}) - if(NOT EXISTS ${CMAKE_SOURCE_DIR}/node_modules/node-cmake/FindNodeJS.cmake) message(FATAL_ERROR "Can't find node-cmake") endif() diff --git a/cmake/test.cmake b/cmake/test.cmake index fc7a22874c..2a83a633c0 100644 --- a/cmake/test.cmake +++ b/cmake/test.cmake @@ -14,7 +14,6 @@ target_include_directories(mbgl-test PRIVATE test/include PRIVATE test/src PRIVATE platform/default - PRIVATE ${MBGL_GENERATED}/include ) target_link_libraries(mbgl-test |