From 8f4b4be6dbc2e2e7105f6617d10de2cfec0e7160 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 8 Apr 2023 23:52:20 -0400 Subject: [PATCH] build: Fix CMakePresets build Also drop 'spark_' in 'spark_admin_web_app_bundle' target. It's just too long --- CMakePresets.json | 8 +++----- src/Spark.Admin.WebApp/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index d4a732c09..6b76c9b49 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -49,12 +49,11 @@ "CMAKE_EXE_LINKER_FLAGS": "-Wno-undef", "EXTERNALS_ROOT": "${sourceDir}/externals/linux", "CMAKE_CXX_STANDARD": "17", - "WEB_TSCONFIG_NAME": "${presetName}", "BUILD_SDK": { "type": "BOOL", "value": "OFF" }, - "BUILD_WEB": { + "BUILD_ADMIN_WEB_APP": { "type": "BOOL", "value": "ON" } @@ -180,13 +179,12 @@ "jobs": 4, "targets": [ "data_files_dir", - "doc_manual_bundle", + "admin_web_app_bundle", "install", "libspark", "rapidjson_project", "server_layout", - "sparkd", - "web_ui_bundle" + "sparkd" ] }, diff --git a/src/Spark.Admin.WebApp/CMakeLists.txt b/src/Spark.Admin.WebApp/CMakeLists.txt index aa11e623d..3dcfe7330 100644 --- a/src/Spark.Admin.WebApp/CMakeLists.txt +++ b/src/Spark.Admin.WebApp/CMakeLists.txt @@ -103,6 +103,6 @@ add_custom_command( COMMENT "Building Spark.Admin.WebApp" DEPENDS ${_build_admin_web_app_deps}) -add_custom_target(spark_admin_web_app_bundle ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bundle.js) +add_custom_target(admin_web_app_bundle ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bundle.js) install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" DESTINATION "${SPARK_INSTALL_PREFIX}/bin")