build: Fix CMakePresets build

Also drop 'spark_' in 'spark_admin_web_app_bundle' target. It's just too
long
This commit is contained in:
John Colvin committed 2023-04-10 11:10:37 -04:00
1 parent 696195aefd
commit 8f4b4be6db
2 files changed
+4 -6

No files matched your search

+3 -5
View File
@@ -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"
]
},
+1 -1
View File
@@ -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")