Commit 6655d934 authored by jan.koester's avatar jan.koester
Browse files

test

parent e117fb57

editor/CMakeLists.txt

+4 −3
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ include(GNUInstallDirs) 
set(CMAKE_CXX_STANDARD 23)

set(CMAKE_CXX_STANDARD_REQUIRED ON)



find_package(NodeJS REQUIRED)



# When built standalone, add parent cmake module path

if(NOT TARGET blogidev)

    list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/../cmake)
@@ -23,7 +25,6 @@ if(NOT TARGET blogidev) 
    find_package(smtpclient REQUIRED)

    find_package(Brotli REQUIRED)

    find_package(paritypp REQUIRED)

    find_package(NodeJS REQUIRED)

    add_definitions(-D${CMAKE_HOST_SYSTEM_NAME} -DWIN32_LEAN_AND_MEAN)

endif()
@@ -65,7 +66,7 @@ if(TARGET blogidev) 
        blogidev

        json-c::json-c

        tinyxml2::tinyxml2

        ${LIBNODE_LIBRARY}

        NodeJS::NodeJS

        dl

    )

    target_sources(blogi-editor PRIVATE
@@ -74,7 +75,7 @@ if(TARGET blogidev) 
    )

else()

    target_link_libraries(blogi-editor PRIVATE

        ${LIBNODE_LIBRARY}

        NodeJS::NodeJS

        httppp::httppp

        netplus::netplus

        htmlpp::htmlpp

editor/widgets/nodewidget/CMakeLists.txt

+3 −3
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ target_compile_definitions(nodewidget PRIVATE BLOGI_HAVE_LIBNODE=1) 
if(TARGET blogidev)

    add_dependencies(nodewidget blogidev)

    if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")

        target_link_libraries(nodewidget PUBLIC blogidev kernel32.lib uuidp::uuidp htmlpp::htmlpp json-c::json-c tinyxml2::tinyxml2 ${BLOGI_LIBNODE_LIBRARY})

        target_link_libraries(nodewidget PUBLIC blogidev kernel32.lib NodeJS::NodeJS uuidp::uuidp htmlpp::htmlpp json-c::json-c tinyxml2::tinyxml2)

    else()

        target_link_libraries(nodewidget PUBLIC blogidev dl uuidp::uuidp htmlpp::htmlpp json-c::json-c tinyxml2::tinyxml2 ${BLOGI_LIBNODE_LIBRARY})

        target_link_libraries(nodewidget PUBLIC blogidev dl NodeJS::NodeJS uuidp::uuidp htmlpp::htmlpp json-c::json-c tinyxml2::tinyxml2)

    endif()

else()

    target_link_libraries(nodewidget PUBLIC editor_plugin_base uuidp::uuidp htmlpp::htmlpp json-c::json-c tinyxml2::tinyxml2 dl ${BLOGI_LIBNODE_LIBRARY})

    target_link_libraries(nodewidget PUBLIC editor_plugin_base NodeJS::NodeJS uuidp::uuidp htmlpp::htmlpp json-c::json-c tinyxml2::tinyxml2 dl)

endif()



install(TARGETS nodewidget DESTINATION lib/blogi/plugins/webedit)