diff --git a/Source/Thunder/GenericConfig.cmake b/Source/Thunder/GenericConfig.cmake index 641a8502c..fff21c764 100644 --- a/Source/Thunder/GenericConfig.cmake +++ b/Source/Thunder/GenericConfig.cmake @@ -27,6 +27,8 @@ set(PERSISTENT_PATH "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/${NAMESPACE}" CACHE PAT set(DATA_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/${NAMESPACE}" CACHE PATH "Data path") set(SYSTEM_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/${NAMESPACE_LIB}/plugins" CACHE PATH "System path") set(EXTENSION_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/${NAMESPACE_LIB}/extensions" CACHE PATH "Extension path") +set(CONFIG_PATH "" CACHE PATH "Plugin configuration path") +set(EXTENSION_CONFIG_PATH "" CACHE PATH "Extension configuration path") set(WEBSERVER_PATH "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/www/html" CACHE PATH "Root path for the HTTP server") set(WEBSERVER_PORT 8080 CACHE STRING "Port for the HTTP server") set(PROXYSTUB_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/${NAMESPACE_LIB}/proxystubs" CACHE PATH "Proxy stub path") @@ -87,6 +89,12 @@ map_set(${CONFIG} volatilepath ${VOLATILE_PATH}) map_set(${CONFIG} datapath ${DATA_PATH}) map_set(${CONFIG} systempath ${SYSTEM_PATH}) map_set(${CONFIG} extensionpath ${EXTENSION_PATH}) +if(NOT CONFIG_PATH STREQUAL "") + map_set(${CONFIG} configs ${CONFIG_PATH}) +endif() +if(NOT EXTENSION_CONFIG_PATH STREQUAL "") + map_set(${CONFIG} extensionconfigs ${EXTENSION_CONFIG_PATH}) +endif() map_set(${CONFIG} proxystubpath ${PROXYSTUB_PATH}) map_set(${CONFIG} postmortempath ${POSTMORTEM_PATH}) map_set(${CONFIG} postmortemworkerpoolsink ${POSTMORTEM_WORKERPOOL_SINK}) diff --git a/Source/Thunder/Thunder.conf.in b/Source/Thunder/Thunder.conf.in index 59c342815..937d9b5d8 100644 --- a/Source/Thunder/Thunder.conf.in +++ b/Source/Thunder/Thunder.conf.in @@ -10,6 +10,8 @@ volatilepath = '@VOLATILE_PATH@' datapath = '@DATA_PATH@' systempath = '@SYSTEM_PATH@' extensionpath = '@EXTENSION_PATH@' +configs = '@CONFIG_PATH@' +extensionconfigs = '@EXTENSION_CONFIG_PATH@' proxystubpath = '@PROXYSTUB_PATH@' postmortempath = '@POSTMORTEM_PATH@' postmortemworkerpoolsink = '@POSTMORTEM_WORKERPOOL_SINK@' diff --git a/Source/Thunder/params.config b/Source/Thunder/params.config index 4342a9ea8..3ba9a605a 100644 --- a/Source/Thunder/params.config +++ b/Source/Thunder/params.config @@ -11,6 +11,8 @@ volatilepath datapath systempath extensionpath +configs +extensionconfigs proxystubpath postmortempath postmortemworkerpoolsink