diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2017-02-21 18:32:53 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2017-02-22 18:22:18 +0100 |
| commit | 5b24b1474187807b46de2e4c4fb587bcdee4d1ea (patch) | |
| tree | 013a4e592303d956e935969f1305695dada1edb3 /cmake/mbgl.cmake | |
| parent | 341e65f7d51e7acc0bf73893317251adc4d23cb6 (diff) | |
| download | qtlocation-mapboxgl-5b24b1474187807b46de2e4c4fb587bcdee4d1ea.tar.gz | |
[build] use node-cmake 2.x
- Removes need to run `npm install` before invoking cmake
Diffstat (limited to 'cmake/mbgl.cmake')
| -rw-r--r-- | cmake/mbgl.cmake | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/cmake/mbgl.cmake b/cmake/mbgl.cmake index 41d820a077..8c9aa0fe8f 100644 --- a/cmake/mbgl.cmake +++ b/cmake/mbgl.cmake @@ -6,21 +6,12 @@ if (NOT MBGL_PLATFORM) endif() endif() -if(NOT EXISTS ${CMAKE_SOURCE_DIR}/node_modules/node-cmake/FindNodeJS.cmake) - message(FATAL_ERROR "Can't find node-cmake") +find_program(NodeJS_EXECUTABLE NAMES nodejs node) +if (NOT NodeJS_EXECUTABLE) + message(FATAL_ERROR "Could not find Node.js") endif() -# Load Node.js -set(NodeJS_CXX_STANDARD 14 CACHE INTERNAL "Use C++14" FORCE) -set(NodeJS_DOWNLOAD ON CACHE INTERNAL "Download node.js sources" FORCE) -set(NodeJS_USE_CLANG_STDLIB OFF CACHE BOOL "Don't use libc++ by default" FORCE) -list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/node_modules/node-cmake) -find_package(NodeJS) - -find_program(npm_EXECUTABLE - NAMES npm - PATHS ${NodeJS_ROOT_DIR}) - +find_program(npm_EXECUTABLE NAMES npm) if (NOT npm_EXECUTABLE) message(FATAL_ERROR "Could not find npm") endif() |