2020-10-12 20:05:09 +01:00
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
|
|
index 890abd4..157a8a1 100644
|
2020-06-21 13:41:38 +01:00
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
2020-10-12 20:05:09 +01:00
|
|
|
@@ -16,13 +16,6 @@ endif()
|
|
|
|
|
set(VERSION "${VERSION}${VERSION_SUFFIX}")
|
|
|
|
|
message("Version ${VERSION}")
|
|
|
|
|
|
|
|
|
|
-set(LLDB_PACKAGE $ENV{LLDB_PACKAGE} CACHE PATH "Zip archive containing LLDB files")
|
|
|
|
|
-if (LLDB_PACKAGE)
|
|
|
|
|
- message("Using LLDB_PACKAGE=${LLDB_PACKAGE}")
|
2020-06-21 13:41:38 +01:00
|
|
|
-else()
|
2020-10-12 20:05:09 +01:00
|
|
|
- message(FATAL_ERROR "LLDB_PACKAGE not set." )
|
2020-06-21 13:41:38 +01:00
|
|
|
-endif()
|
|
|
|
|
-
|
2020-10-12 20:05:09 +01:00
|
|
|
set(TEST_TIMEOUT 5000 CACHE STRING "Test timeout [ms]")
|
|
|
|
|
|
2020-06-21 13:41:38 +01:00
|
|
|
# General OS-specific definitions
|
2020-10-12 20:05:09 +01:00
|
|
|
@@ -87,16 +80,6 @@ configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY)
|
2020-06-21 13:41:38 +01:00
|
|
|
configure_file(webpack.config.js ${CMAKE_CURRENT_BINARY_DIR}/webpack.config.js @ONLY)
|
|
|
|
|
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
|
2020-10-12 20:05:09 +01:00
|
|
|
|
2020-06-21 13:41:38 +01:00
|
|
|
-# Run 'npm install'
|
|
|
|
|
-execute_process(
|
|
|
|
|
- COMMAND ${NPM} install
|
|
|
|
|
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
|
|
|
|
|
- RESULT_VARIABLE Result
|
|
|
|
|
-)
|
|
|
|
|
-if (NOT ${Result} EQUAL 0)
|
|
|
|
|
- message(FATAL_ERROR "npm intall failed: ${Result}")
|
|
|
|
|
-endif()
|
|
|
|
|
-
|
|
|
|
|
# Copy it back, so we can commit the lock file.
|
|
|
|
|
file(COPY ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
|
