Loading editor/src/main.cpp +0 −1 Original line number Diff line number Diff line Loading @@ -39,7 +39,6 @@ #include <confplus/exception.h> #include "plugin.h" #include "node_embedded.h" #include "webedit_config.h" #include "webedit_db.h" #include "webedit_server.h" Loading editor/src/webedit_api.cpp +1 −1 Original line number Diff line number Diff line Loading @@ -49,7 +49,7 @@ #include "webedit_api.h" #include "htmlimport.h" #include "node_embedded.h" #include "../widgets/nodewidget/node_embedded.h" #include "../widgets/nodewidget/nodewidget_adapter.h" Loading editor/widgets/nodewidget/CMakeLists.txt +18 −12 Original line number Diff line number Diff line find_package(NodeJS) if(NodeJS_FOUND) add_library(nodewidget SHARED nodewidget.cpp nodewidget_adapter.cpp) target_include_directories(nodewidget PRIVATE ${BLOGI_LIBNODE_INCLUDE_DIR}) Loading @@ -6,12 +10,14 @@ 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 NodeJS::NodeJS uuidp::uuidp htmlpp::htmlpp json-c::json-c tinyxml2::tinyxml2 ${BLOGI_LIBNODE_LIBRARY}) target_link_libraries(nodewidget PUBLIC blogidev kernel32.lib uuidp::uuidp htmlpp::htmlpp json-c::json-c tinyxml2::tinyxml2 ${BLOGI_LIBNODE_LIBRARY}) else() target_link_libraries(nodewidget PUBLIC blogidev dl NodeJS::NodeJS uuidp::uuidp htmlpp::htmlpp json-c::json-c tinyxml2::tinyxml2 ${BLOGI_LIBNODE_LIBRARY}) target_link_libraries(nodewidget PUBLIC blogidev dl uuidp::uuidp htmlpp::htmlpp json-c::json-c tinyxml2::tinyxml2 ${BLOGI_LIBNODE_LIBRARY}) endif() else() target_link_libraries(nodewidget PUBLIC editor_plugin_base NodeJS::NodeJS uuidp::uuidp htmlpp::htmlpp json-c::json-c tinyxml2::tinyxml2 dl ${BLOGI_LIBNODE_LIBRARY}) endif() install(TARGETS nodewidget DESTINATION lib/blogi/plugins/webedit) endif() No newline at end of file editor/src/node_embedded.h→editor/widgets/nodewidget/node_embedded.h +0 −0 Original line number Diff line number Diff line editor/widgets/nodewidget/nodewidget_adapter.cpp +1 −1 Original line number Diff line number Diff line Loading @@ -11,7 +11,7 @@ #include <stdexcept> #include <string> #include "../../src/node_embedded.h" #include "node_embedded.h" namespace blogi::webedit { Loading Loading
editor/src/main.cpp +0 −1 Original line number Diff line number Diff line Loading @@ -39,7 +39,6 @@ #include <confplus/exception.h> #include "plugin.h" #include "node_embedded.h" #include "webedit_config.h" #include "webedit_db.h" #include "webedit_server.h" Loading
editor/src/webedit_api.cpp +1 −1 Original line number Diff line number Diff line Loading @@ -49,7 +49,7 @@ #include "webedit_api.h" #include "htmlimport.h" #include "node_embedded.h" #include "../widgets/nodewidget/node_embedded.h" #include "../widgets/nodewidget/nodewidget_adapter.h" Loading
editor/widgets/nodewidget/CMakeLists.txt +18 −12 Original line number Diff line number Diff line find_package(NodeJS) if(NodeJS_FOUND) add_library(nodewidget SHARED nodewidget.cpp nodewidget_adapter.cpp) target_include_directories(nodewidget PRIVATE ${BLOGI_LIBNODE_INCLUDE_DIR}) Loading @@ -6,12 +10,14 @@ 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 NodeJS::NodeJS uuidp::uuidp htmlpp::htmlpp json-c::json-c tinyxml2::tinyxml2 ${BLOGI_LIBNODE_LIBRARY}) target_link_libraries(nodewidget PUBLIC blogidev kernel32.lib uuidp::uuidp htmlpp::htmlpp json-c::json-c tinyxml2::tinyxml2 ${BLOGI_LIBNODE_LIBRARY}) else() target_link_libraries(nodewidget PUBLIC blogidev dl NodeJS::NodeJS uuidp::uuidp htmlpp::htmlpp json-c::json-c tinyxml2::tinyxml2 ${BLOGI_LIBNODE_LIBRARY}) target_link_libraries(nodewidget PUBLIC blogidev dl uuidp::uuidp htmlpp::htmlpp json-c::json-c tinyxml2::tinyxml2 ${BLOGI_LIBNODE_LIBRARY}) endif() else() target_link_libraries(nodewidget PUBLIC editor_plugin_base NodeJS::NodeJS uuidp::uuidp htmlpp::htmlpp json-c::json-c tinyxml2::tinyxml2 dl ${BLOGI_LIBNODE_LIBRARY}) endif() install(TARGETS nodewidget DESTINATION lib/blogi/plugins/webedit) endif() No newline at end of file
editor/src/node_embedded.h→editor/widgets/nodewidget/node_embedded.h +0 −0 Original line number Diff line number Diff line
editor/widgets/nodewidget/nodewidget_adapter.cpp +1 −1 Original line number Diff line number Diff line Loading @@ -11,7 +11,7 @@ #include <stdexcept> #include <string> #include "../../src/node_embedded.h" #include "node_embedded.h" namespace blogi::webedit { Loading