Merge pull request #586 from Juff-Ma/main

Update CMake build system and introduce Conan and VCPKG

Author: AlbertShown

.gitignore

@@ -125,4 +125,15 @@ Thumbs.db
 **/cmake_install.cmake
 **/CMakeCache.txt
 **/CMakeFiles/
+CMakeUserPresets.json
 .zig-cache
+
+# Conan
+**/compressor
+**/conan-*
+**/cmake-build-*
+**/deactivate_conanbuildenv*
+
+# vcpkg
+vcpkg-manifest-install.log
+vcpkg_installed/

CMakeLists.txt

@@ -1,38 +1,57 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.18)
 
 # Project name
-project(WebUILibrary)
+project(WebUILibrary 
+ VERSION 2.5.0
+ DESCRIPTION "Use any web browser or WebView as GUI, with your preferred language in the backend and modern web technologies in the frontend, all in a lightweight portable library."
+ HOMEPAGE_URL "https://webui.me/")
 
-# Set C++ standard
+# Set C & C++ standard
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_STANDARD_REQUIRED ON)
 
 # Variables for library names, source files, etc.
-set(WEBUI_OUT_LIB_NAME "webui-2")
+set(WEBUI_DEFAULT_OUT_LIB_NAME "webui-2")
 
 # Conditional compilation for TLS
 option(WEBUI_USE_TLS "Enable TLS support" OFF)
-if(WEBUI_USE_TLS)
- find_package(OpenSSL REQUIRED)
- set(WEBUI_OUT_LIB_NAME "webui-2-secure")
+if (WEBUI_USE_TLS)
+  find_package(OpenSSL REQUIRED)
+  set(WEBUI_DEFAULT_OUT_LIB_NAME "webui-2-secure")
 endif()
 
+if (NOT BUILD_SHARED_LIBS)
+ set(WEBUI_DEFAULT_OUT_LIB_NAME "${WEBUI_DEFAULT_OUT_LIB_NAME}-static")
+endif()
+
+# Output library name
+set(WEBUI_OUT_LIB_NAME "${WEBUI_DEFAULT_OUT_LIB_NAME}" CACHE STRING "Name of the output library")
+
 # Source files (already filled)
 set(SOURCE_FILES
  src/civetweb/civetweb.c
  src/webui.c
 )
+if (APPLE)
+ # enable macos webview
+ enable_language(OBJC)
+ set(CMAKE_OBJC_STANDARD 11)
+ list(APPEND SOURCE_FILES src/webview/wkwebview.m)
+endif()
 
 # Library targets
 add_library(webui ${SOURCE_FILES})
 target_include_directories(webui PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>)
-target_compile_definitions(webui PUBLIC NDEBUG NO_CACHING NO_CGI USE_WEBSOCKET)
+target_compile_definitions(webui PUBLIC NO_CACHING NO_CGI USE_WEBSOCKET 
+ "$<$<CONFIG:Debug>:WEBUI_LOG>" "$<$<NOT:$<CONFIG:Debug>>:NDEBUG>")
 
-if(BUILD_SHARED_LIBS AND WIN32)
+if (BUILD_SHARED_LIBS AND WIN32)
  target_compile_definitions(webui PRIVATE CIVETWEB_DLL_EXPORTS PUBLIC CIVETWEB_DLL_IMPORTS)
 endif()
 
-if(WEBUI_USE_TLS)
+if (WEBUI_USE_TLS)
  target_compile_definitions(webui PUBLIC WEBUI_TLS NO_SSL_DL OPENSSL_API_1_1)
  target_link_libraries(webui PRIVATE OpenSSL::SSL OpenSSL::Crypto)
 else()
@@ -41,11 +60,16 @@ endif()
 
 if (WIN32)
  target_link_libraries(webui PRIVATE ws2_32 user32 shell32 ole32)
-endif ()
+elseif (APPLE)
+ # link required frameworks
+ find_library(COCOA_FRAMEWORK Cocoa REQUIRED)
+ find_library(WEBKIT_FRAMEWORK WebKit REQUIRED)
+
+ target_link_libraries(webui PRIVATE ${COCOA_FRAMEWORK} ${WEBKIT_FRAMEWORK})
+endif()
 
 set_target_properties(webui PROPERTIES
- OUTPUT_NAME ${WEBUI_OUT_LIB_NAME}
- PREFIX "")
+ OUTPUT_NAME ${WEBUI_OUT_LIB_NAME})
 
 # Install headers
 install(FILES include/webui.h include/webui.hpp DESTINATION include)
@@ -54,7 +78,8 @@ install(FILES include/webui.h include/webui.hpp DESTINATION include)
 install(TARGETS webui
  EXPORT webui
  ARCHIVE DESTINATION lib
- LIBRARY DESTINATION lib)
+ LIBRARY DESTINATION lib
+ RUNTIME DESTINATION bin)
 
 install(EXPORT webui
  FILE webui-config.cmake

conanfile.py

@@ -0,0 +1,33 @@
+from conan import ConanFile
+from conan.tools.cmake import CMake, CMakeToolchain
+
+class WebuiConan(ConanFile):
+ name = "webui"
+ version = "2.5.0-beta.4"
+ license = "MIT"
+ url = "https://github.com/webui-dev/webui"
+ homepage = "https://webui.me"
+ description = "Use any web browser or WebView as GUI, with your preferred language in the backend and modern web technologies in the frontend, all in a lightweight portable library."
+
+ settings = "os", "compiler", "build_type", "arch"
+ options = {"tls": [True, False], "shared": [True, False]}
+ default_options = {"tls": False, "shared": False}
+
+ generators = "CMakeDeps"
+
+ def generate(self):
+ tc = CMakeToolchain(self)
+ tc.variables["WEBUI_USE_TLS"] = self.options.tls
+ tc.variables["BUILD_SHARED_LIBS"] = self.options.shared
+ tc.generate()
+
+ def build(self):
+ cmake = CMake(self)
+ cmake.configure()
+ cmake.build()
+
+ def requirements(self):
+ self.tool_requires("cmake/[>=3.18.0]")
+
+ if self.options.tls:
+ self.requires("openssl/[>3.0.0]")

vcpkg.json

@@ -0,0 +1,30 @@
+{
+ "name": "webui",
+ "version": "2.5.0-beta.4",
+ "description": "Use any web browser or WebView as GUI, with your preferred language in the backend and modern web technologies in the frontend, all in a lightweight portable library.",
+ "license": "MIT",
+ "homepage": "https://webui.me",
+ "dependencies": [
+ {
+ "name": "webview2",
+ "platform": "windows"
+ },
+ {
+ "name": "vcpkg-cmake",
+ "host": true
+ },
+ {
+ "name": "vcpkg-cmake-config",
+ "host": true
+ }
+ ],
+ "features": {
+ "tls": {
+ "description": "Enable TLS support",
+ "dependencies": [{
+ "name": "openssl",
+ "version>=": "3.0.0"
+ }]
+ }
+ }
+}