Add cmake support to qserv_web

MikeeRead · Nov 10, 2021 · 4bc621c · 4bc621c
1 parent bc6f378
commit 4bc621c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,12 +16,7 @@ install(CODE "execute_process(COMMAND pip3 install ${CMAKE_CURRENT_SOURCE_DIR}/e
 
 add_subdirectory(extern/log)
 add_subdirectory(extern/partition)
+add_subdirectory(extern/qserv_web)
 add_subdirectory(extern/sphgeom)
 
 add_subdirectory(src)
-
-# TODO do we want to add cmake capability to the qserv_web project?
-install(
-    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/extern/qserv_web/www
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/qserv/dashboard
-)
diff --git a/extern/qserv_web b/extern/qserv_web
diff --git a/src/admin/python/cli/script.py b/src/admin/python/cli/script.py
@@ -60,7 +60,7 @@ def smig_dir():
     "/usr/local/qserv/templates/repl-ctl/etc/log4cxx.replication.properties.jinja"
 )
 replica_controller_log_path = "/config-etc/log4cxx.replication.properties"
-replica_controller_http_root = "/usr/local/qserv/dashboard/www"
+replica_controller_http_root = "/usr/local/qserv/www"
 
 mysqld_user_qserv = "qsmaster"