From e22b0acc42c77925fd923e7a4394e04525b7b301 Mon Sep 17 00:00:00 2001 From: pvn Date: Mon, 4 Aug 2025 23:48:37 -0400 Subject: [PATCH 1/2] build examples (Windows only at this time) --- CMakeLists.txt | 32 ++++++++++++++++++++++++++++++++ build.cmake.sh | 9 +++++++++ 2 files changed, 41 insertions(+) create mode 100644 build.cmake.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index ec67717ea..dfab3b369 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,3 +86,35 @@ install(EXPORT webui NAMESPACE webui:: DESTINATION share/webui ) + + +#////////////////////////// +# Build examples +#////////////////////////// + +message(STATUS "Source directory is " ${CMAKE_SOURCE_DIR}) +message(STATUS "Build directory is " ${CMAKE_BINARY_DIR}) + +if (MSVC) + include_directories(${CMAKE_SOURCE_DIR}/include) +elseif(APPLE) +elseif(LINUX) +endif() + +add_executable(minimal ${CMAKE_SOURCE_DIR}/examples/C++/minimal/main.cpp) +add_executable(call_js_from_cpp ${CMAKE_SOURCE_DIR}/examples/C++/call_js_from_cpp/main.cpp) +add_executable(call_js_from_c ${CMAKE_SOURCE_DIR}/examples/C/call_js_from_c/main.c) + +target_link_libraries(minimal webui) +target_link_libraries(call_js_from_cpp webui) +target_link_libraries(call_js_from_c webui) + +if (MSVC) + set_target_properties(minimal PROPERTIES LINK_FLAGS "/SubSystem:\"Windows\"" VS_DPI_AWARE "ON") + set_target_properties(call_js_from_cpp PROPERTIES LINK_FLAGS "/SubSystem:\"Windows\"" VS_DPI_AWARE "ON") + set_target_properties(call_js_from_c PROPERTIES LINK_FLAGS "/SubSystem:\"Windows\"" VS_DPI_AWARE "ON") +endif() + +if (MSVC) + set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT call_js_from_cpp) +endif() diff --git a/build.cmake.sh b/build.cmake.sh new file mode 100644 index 000000000..66b440be3 --- /dev/null +++ b/build.cmake.sh @@ -0,0 +1,9 @@ +#!/bin/bash +mkdir -p build + +# webui-2.5.0, examples +pushd build +cmake .. --fresh +cmake --build . --config Debug +popd + From cff040769671a1889f3d31aff96ac95b9c402d07 Mon Sep 17 00:00:00 2001 From: pvn Date: Tue, 5 Aug 2025 00:53:00 -0400 Subject: [PATCH 2/2] remove unnecessary Windows condition --- CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dfab3b369..14a1abbe8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,11 +95,7 @@ install(EXPORT webui message(STATUS "Source directory is " ${CMAKE_SOURCE_DIR}) message(STATUS "Build directory is " ${CMAKE_BINARY_DIR}) -if (MSVC) - include_directories(${CMAKE_SOURCE_DIR}/include) -elseif(APPLE) -elseif(LINUX) -endif() +include_directories(${CMAKE_SOURCE_DIR}/include) add_executable(minimal ${CMAKE_SOURCE_DIR}/examples/C++/minimal/main.cpp) add_executable(call_js_from_cpp ${CMAKE_SOURCE_DIR}/examples/C++/call_js_from_cpp/main.cpp)