mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-23 06:03:40 +00:00
53 lines
2.2 KiB
Diff
53 lines
2.2 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 6ae4dfb..519f544 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -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}")
|
|
-else()
|
|
- message(FATAL_ERROR "LLDB_PACKAGE not set." )
|
|
-endif()
|
|
-
|
|
if (CMAKE_SYSROOT)
|
|
set(CMAKE_C_FLAGS "--sysroot=${CMAKE_SYSROOT} ${CMAKE_C_FLAGS}")
|
|
set(CMAKE_CXX_FLAGS "--sysroot=${CMAKE_SYSROOT} ${CMAKE_CXX_FLAGS}")
|
|
@@ -93,16 +86,6 @@ configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY)
|
|
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})
|
|
|
|
-# Run 'npm install'
|
|
-execute_process(
|
|
- COMMAND ${NPM} ci # like install, but actually respects package-lock file.
|
|
- 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})
|
|
|
|
@@ -154,6 +137,7 @@ add_custom_target(tests
|
|
|
|
add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_BINARY_DIR}/README.md)
|
|
add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/CHANGELOG.md ${CMAKE_CURRENT_BINARY_DIR}/CHANGELOG.md)
|
|
+add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE ${CMAKE_CURRENT_BINARY_DIR}/LICENSE)
|
|
add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/images/lldb.png ${CMAKE_CURRENT_BINARY_DIR}/images/lldb.png)
|
|
add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/images/user.svg ${CMAKE_CURRENT_BINARY_DIR}/images/user.svg)
|
|
add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/images/users.svg ${CMAKE_CURRENT_BINARY_DIR}/images/users.svg)
|
|
@@ -170,6 +154,7 @@ add_custom_target(dev_debugging
|
|
set(PackagedFilesBootstrap
|
|
README.md
|
|
CHANGELOG.md
|
|
+ LICENSE
|
|
extension.js
|
|
images/*
|
|
syntaxes/*
|
|
|