plugins_builtin

Author: lws-team

CMakeLists.txt

@@ -586,6 +586,8 @@ if (CMAKE_TOOLCHAIN_FILE)
 endif()
 
 if (WIN32)
+message(STATUS "LWS_BUILTIN_PLUGIN_NAMES: ${LWS_BUILTIN_PLUGIN_NAMES}")
+message(STATUS "CONFIG_SCOPE: ${LWS_BUILTIN_PLUGIN_NAMES}")
 	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/win32port/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/win32port/version.rc @ONLY)
 	set(RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/win32port/version.rc)
        include_directories("${CMAKE_CURRENT_SOURCE_DIR}/win32port/win32helpers")
@@ -1194,6 +1196,27 @@ endif()
 
 if (LWS_WITH_PLUGINS_BUILTIN)
 	add_subdirectory(plugins)
+
+	set(PLUGIN_EXTERNS "")
+	set(PLUGIN_PTRS "")
+	foreach(PLUGIN ${LWS_BUILTIN_PLUGIN_NAMES})
+		string(REGEX MATCH "^[^_-]+[-_](.*)$" MATCHED "${PLUGIN}")
+		set(PLUGIN_STRUCT_NAME ${CMAKE_MATCH_1})
+		string(APPEND PLUGIN_EXTERNS "extern const lws_plugin_protocol_t ${PLUGIN_STRUCT_NAME};\n")
+		string(APPEND PLUGIN_PTRS "    &${PLUGIN_STRUCT_NAME},\n")
+	endforeach()
+
+	set(PLUGIN_BUILTIN_C_CONTENT "
+/* Generated by CMake */
+#include <libwebsockets.h>
+${PLUGIN_EXTERNS}
+const lws_plugin_protocol_t *builtin_pcols[] = {
+${PLUGIN_PTRS}
+    NULL
+};
+")
+	file(WRITE "${PROJECT_BINARY_DIR}/lws_builtin_plugin_pcols.c" "${PLUGIN_BUILTIN_C_CONTENT}")
+	list(APPEND SOURCES "${PROJECT_BINARY_DIR}/lws_builtin_plugin_pcols.c")
 endif()
 
 
@@ -1216,15 +1239,21 @@ else()
   set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/libwebsockets)
 endif()
 
+message(STATUS "LWS_BUILTIN_PLUGIN_NAMES: ${LWS_BUILTIN_PLUGIN_NAMES}")
+message(STATUS "CONFIG_SCOPE: ${LWS_BUILTIN_PLUGIN_NAMES}")
 configure_file(${PROJECT_SOURCE_DIR}/cmake/LwsCheckRequirements.cmake
 		${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/LwsCheckRequirements.cmake
 		@ONLY)
 
+message(STATUS "LWS_BUILTIN_PLUGIN_NAMES: ${LWS_BUILTIN_PLUGIN_NAMES}")
+message(STATUS "CONFIG_SCOPE: ${LWS_BUILTIN_PLUGIN_NAMES}")
 configure_file(${PROJECT_SOURCE_DIR}/cmake/LwsCheckRequirements.cmake
 		${PROJECT_BINARY_DIR}/LwsCheckRequirements.cmake
 		@ONLY)  
 
 # Generate version info for both build-tree and install-tree.
+message(STATUS "LWS_BUILTIN_PLUGIN_NAMES: ${LWS_BUILTIN_PLUGIN_NAMES}")
+message(STATUS "CONFIG_SCOPE: ${LWS_BUILTIN_PLUGIN_NAMES}")
 configure_file(${PROJECT_SOURCE_DIR}/cmake/libwebsockets-config-version.cmake.in
                 ${PROJECT_BINARY_DIR}/libwebsockets-config-version.cmake 
                 @ONLY)
@@ -1234,6 +1263,8 @@ set(LWS__INCLUDE_DIRS
     "${PROJECT_SOURCE_DIR}/lib"
     "${PROJECT_BINARY_DIR}")
 set(LIBWEBSOCKETS_INCLUDE_DIRS ${LWS__INCLUDE_DIRS} CACHE PATH "Libwebsockets include directories")
+message(STATUS "LWS_BUILTIN_PLUGIN_NAMES: ${LWS_BUILTIN_PLUGIN_NAMES}")
+message(STATUS "CONFIG_SCOPE: ${LWS_BUILTIN_PLUGIN_NAMES}")
 configure_file(${PROJECT_SOURCE_DIR}/cmake/libwebsockets-config.cmake.in
                 ${PROJECT_BINARY_DIR}/libwebsockets-config.cmake 
                 @ONLY)
@@ -1275,6 +1306,8 @@ if (LWS_WITH_MCUFONT_ENCODER)
 endif()
 
 # Generate the lws_config.h that includes all the public compilation settings.
+message(STATUS "LWS_BUILTIN_PLUGIN_NAMES: ${LWS_BUILTIN_PLUGIN_NAMES}")
+message(STATUS "CONFIG_SCOPE: ${LWS_BUILTIN_PLUGIN_NAMES}")
 configure_file(
        "${PROJECT_SOURCE_DIR}/cmake/lws_config.h.in"
        "${PROJECT_BINARY_DIR}/lws_config.h")
@@ -1344,7 +1377,7 @@ file(RELATIVE_PATH
     "${LWS_ABSOLUTE_INSTALL_INCLUDE_DIR}") # Calculate the relative directory from the cmake dir.
 
 if (DEFINED REL_INCLUDE_DIR)
-    set(LWS__INCLUDE_DIRS "\${LWS_CMAKE_DIR}/${REL_INCLUDE_DIR}")
+    set(LWS__INCLUDE_DIRS "${LWS_CMAKE_DIR}/${REL_INCLUDE_DIR}")
 endif()
 
 set(STRIPPED_LIB_LIST_AT_END "")
@@ -1359,6 +1392,8 @@ foreach(lib_path IN LISTS LIB_LIST_AT_END)
 endforeach()
 set(LIB_LIST_AT_END ${STRIPPED_LIB_LIST_AT_END})
 
+message(STATUS "LWS_BUILTIN_PLUGIN_NAMES: ${LWS_BUILTIN_PLUGIN_NAMES}")
+message(STATUS "CONFIG_SCOPE: ${LWS_BUILTIN_PLUGIN_NAMES}")
 configure_file(${PROJECT_SOURCE_DIR}/cmake/libwebsockets-config.cmake.in
                 ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/libwebsockets-config.cmake
                 @ONLY)

lib/misc/dir.c

@@ -367,19 +367,15 @@ lws_plugin_alloc(struct lws_plugin **pplugin)
 
 #if defined(LWS_BUILTIN_PLUGIN_NAMES)
 
-extern lws_plugin_protocol_t lws_sshd_demo, lws_ssh_base;
-
-lws_plugin_protocol_t *builtin_pcols[] = {
-	&lws_sshd_demo, &lws_ssh_base
-};
+extern const lws_plugin_protocol_t *builtin_pcols[];
 
 int
 lws_plugins_handle_builtin(struct lws_plugin **pplugin,
 			   each_plugin_cb_t each, void *each_user)
 {
 	size_t n = 0;
 
-	while (n < LWS_ARRAY_SIZE(builtin_pcols)) {
+	while (builtin_pcols[n]) {
 		struct lws_plugin *pin = lws_plugin_alloc(pplugin);
 		if (!pin)
 			return 1;

plugins/CMakeLists.txt

@@ -210,3 +210,4 @@ if (LWS_WITH_PLUGINS AND NOT LWS_WITH_PLUGINS_BUILTIN)
 endif()
 
 export_to_parent_intermediate()
+set(LWS_BUILTIN_PLUGIN_NAMES ${LWS_BUILTIN_PLUGIN_NAMES} PARENT_SCOPE)