From e87485441eda73577cd11df5c5d418ec8249aea2 Mon Sep 17 00:00:00 2001 From: Atul R Date: Sun, 22 Sep 2019 14:24:46 +0200 Subject: [PATCH] Adds include and linkings for plugins --- CMakeLists.txt | 33 ++++++++----------- config/plugin.cmake | 32 ++++++++++++++++++ examples/README.md | 7 ---- package.json | 7 ++-- plugin/index.js | 11 +++++++ src/cpp/{ => include}/deps/spdlog/async.h | 0 .../{ => include}/deps/spdlog/async_logger.h | 0 src/cpp/{ => include}/deps/spdlog/common.h | 0 .../deps/spdlog/details/async_logger_impl.h | 0 .../deps/spdlog/details/circular_q.h | 0 .../deps/spdlog/details/console_globals.h | 0 .../deps/spdlog/details/file_helper.h | 0 .../deps/spdlog/details/fmt_helper.h | 0 .../deps/spdlog/details/log_msg.h | 0 .../deps/spdlog/details/logger_impl.h | 0 .../deps/spdlog/details/mpmc_blocking_q.h | 0 .../deps/spdlog/details/null_mutex.h | 0 .../{ => include}/deps/spdlog/details/os.h | 0 .../deps/spdlog/details/pattern_formatter.h | 0 .../deps/spdlog/details/periodic_worker.h | 0 .../deps/spdlog/details/registry.h | 0 .../deps/spdlog/details/thread_pool.h | 0 .../deps/spdlog/fmt/bin_to_hex.h | 0 .../deps/spdlog/fmt/bundled/LICENSE.rst | 0 .../deps/spdlog/fmt/bundled/chrono.h | 0 .../deps/spdlog/fmt/bundled/color.h | 0 .../deps/spdlog/fmt/bundled/core.h | 0 .../deps/spdlog/fmt/bundled/format-inl.h | 0 .../deps/spdlog/fmt/bundled/format.h | 0 .../deps/spdlog/fmt/bundled/locale.h | 0 .../deps/spdlog/fmt/bundled/ostream.h | 0 .../deps/spdlog/fmt/bundled/posix.h | 0 .../deps/spdlog/fmt/bundled/printf.h | 0 .../deps/spdlog/fmt/bundled/ranges.h | 0 .../deps/spdlog/fmt/bundled/time.h | 0 src/cpp/{ => include}/deps/spdlog/fmt/fmt.h | 0 src/cpp/{ => include}/deps/spdlog/fmt/ostr.h | 0 src/cpp/{ => include}/deps/spdlog/formatter.h | 0 src/cpp/{ => include}/deps/spdlog/logger.h | 0 .../deps/spdlog/sinks/android_sink.h | 0 .../deps/spdlog/sinks/ansicolor_sink.h | 0 .../deps/spdlog/sinks/base_sink.h | 0 .../deps/spdlog/sinks/basic_file_sink.h | 0 .../deps/spdlog/sinks/daily_file_sink.h | 0 .../deps/spdlog/sinks/dist_sink.h | 0 .../deps/spdlog/sinks/msvc_sink.h | 0 .../deps/spdlog/sinks/null_sink.h | 0 .../deps/spdlog/sinks/ostream_sink.h | 0 .../deps/spdlog/sinks/rotating_file_sink.h | 0 .../{ => include}/deps/spdlog/sinks/sink.h | 0 .../deps/spdlog/sinks/stdout_color_sinks.h | 0 .../deps/spdlog/sinks/stdout_sinks.h | 0 .../deps/spdlog/sinks/syslog_sink.h | 0 .../deps/spdlog/sinks/wincolor_sink.h | 0 src/cpp/{ => include}/deps/spdlog/spdlog.h | 0 src/cpp/{ => include}/deps/spdlog/tweakme.h | 0 src/cpp/{ => include}/deps/spdlog/version.h | 0 src/cpp/{ => include}/deps/yoga/Bitfield.h | 0 .../{ => include}/deps/yoga/CompactValue.h | 0 src/cpp/{ => include}/deps/yoga/Utils.cpp | 0 src/cpp/{ => include}/deps/yoga/Utils.h | 0 src/cpp/{ => include}/deps/yoga/YGConfig.cpp | 0 src/cpp/{ => include}/deps/yoga/YGConfig.h | 0 src/cpp/{ => include}/deps/yoga/YGEnums.cpp | 0 src/cpp/{ => include}/deps/yoga/YGEnums.h | 0 .../{ => include}/deps/yoga/YGFloatOptional.h | 0 src/cpp/{ => include}/deps/yoga/YGLayout.cpp | 0 src/cpp/{ => include}/deps/yoga/YGLayout.h | 0 src/cpp/{ => include}/deps/yoga/YGMacros.h | 0 src/cpp/{ => include}/deps/yoga/YGNode.cpp | 0 src/cpp/{ => include}/deps/yoga/YGNode.h | 0 .../{ => include}/deps/yoga/YGNodePrint.cpp | 0 src/cpp/{ => include}/deps/yoga/YGNodePrint.h | 0 src/cpp/{ => include}/deps/yoga/YGStyle.cpp | 0 src/cpp/{ => include}/deps/yoga/YGStyle.h | 0 src/cpp/{ => include}/deps/yoga/YGValue.cpp | 0 src/cpp/{ => include}/deps/yoga/YGValue.h | 0 .../{ => include}/deps/yoga/Yoga-internal.h | 0 src/cpp/{ => include}/deps/yoga/Yoga.cpp | 0 src/cpp/{ => include}/deps/yoga/Yoga.h | 0 .../{ => include}/deps/yoga/event/event.cpp | 0 src/cpp/{ => include}/deps/yoga/event/event.h | 0 .../deps/yoga/internal/experiments-inl.h | 0 .../deps/yoga/internal/experiments.cpp | 0 .../deps/yoga/internal/experiments.h | 0 src/cpp/{ => include}/deps/yoga/log.cpp | 0 src/cpp/{ => include}/deps/yoga/log.h | 0 .../nodegui/core/NodeWidget/nodewidget.h | 1 - 88 files changed, 61 insertions(+), 30 deletions(-) create mode 100644 config/plugin.cmake delete mode 100644 examples/README.md create mode 100644 plugin/index.js rename src/cpp/{ => include}/deps/spdlog/async.h (100%) rename src/cpp/{ => include}/deps/spdlog/async_logger.h (100%) rename src/cpp/{ => include}/deps/spdlog/common.h (100%) rename src/cpp/{ => include}/deps/spdlog/details/async_logger_impl.h (100%) rename src/cpp/{ => include}/deps/spdlog/details/circular_q.h (100%) rename src/cpp/{ => include}/deps/spdlog/details/console_globals.h (100%) rename src/cpp/{ => include}/deps/spdlog/details/file_helper.h (100%) rename src/cpp/{ => include}/deps/spdlog/details/fmt_helper.h (100%) rename src/cpp/{ => include}/deps/spdlog/details/log_msg.h (100%) rename src/cpp/{ => include}/deps/spdlog/details/logger_impl.h (100%) rename src/cpp/{ => include}/deps/spdlog/details/mpmc_blocking_q.h (100%) rename src/cpp/{ => include}/deps/spdlog/details/null_mutex.h (100%) rename src/cpp/{ => include}/deps/spdlog/details/os.h (100%) rename src/cpp/{ => include}/deps/spdlog/details/pattern_formatter.h (100%) rename src/cpp/{ => include}/deps/spdlog/details/periodic_worker.h (100%) rename src/cpp/{ => include}/deps/spdlog/details/registry.h (100%) rename src/cpp/{ => include}/deps/spdlog/details/thread_pool.h (100%) rename src/cpp/{ => include}/deps/spdlog/fmt/bin_to_hex.h (100%) rename src/cpp/{ => include}/deps/spdlog/fmt/bundled/LICENSE.rst (100%) rename src/cpp/{ => include}/deps/spdlog/fmt/bundled/chrono.h (100%) rename src/cpp/{ => include}/deps/spdlog/fmt/bundled/color.h (100%) rename src/cpp/{ => include}/deps/spdlog/fmt/bundled/core.h (100%) rename src/cpp/{ => include}/deps/spdlog/fmt/bundled/format-inl.h (100%) rename src/cpp/{ => include}/deps/spdlog/fmt/bundled/format.h (100%) rename src/cpp/{ => include}/deps/spdlog/fmt/bundled/locale.h (100%) rename src/cpp/{ => include}/deps/spdlog/fmt/bundled/ostream.h (100%) rename src/cpp/{ => include}/deps/spdlog/fmt/bundled/posix.h (100%) rename src/cpp/{ => include}/deps/spdlog/fmt/bundled/printf.h (100%) rename src/cpp/{ => include}/deps/spdlog/fmt/bundled/ranges.h (100%) rename src/cpp/{ => include}/deps/spdlog/fmt/bundled/time.h (100%) rename src/cpp/{ => include}/deps/spdlog/fmt/fmt.h (100%) rename src/cpp/{ => include}/deps/spdlog/fmt/ostr.h (100%) rename src/cpp/{ => include}/deps/spdlog/formatter.h (100%) rename src/cpp/{ => include}/deps/spdlog/logger.h (100%) rename src/cpp/{ => include}/deps/spdlog/sinks/android_sink.h (100%) rename src/cpp/{ => include}/deps/spdlog/sinks/ansicolor_sink.h (100%) rename src/cpp/{ => include}/deps/spdlog/sinks/base_sink.h (100%) rename src/cpp/{ => include}/deps/spdlog/sinks/basic_file_sink.h (100%) rename src/cpp/{ => include}/deps/spdlog/sinks/daily_file_sink.h (100%) rename src/cpp/{ => include}/deps/spdlog/sinks/dist_sink.h (100%) rename src/cpp/{ => include}/deps/spdlog/sinks/msvc_sink.h (100%) rename src/cpp/{ => include}/deps/spdlog/sinks/null_sink.h (100%) rename src/cpp/{ => include}/deps/spdlog/sinks/ostream_sink.h (100%) rename src/cpp/{ => include}/deps/spdlog/sinks/rotating_file_sink.h (100%) rename src/cpp/{ => include}/deps/spdlog/sinks/sink.h (100%) rename src/cpp/{ => include}/deps/spdlog/sinks/stdout_color_sinks.h (100%) rename src/cpp/{ => include}/deps/spdlog/sinks/stdout_sinks.h (100%) rename src/cpp/{ => include}/deps/spdlog/sinks/syslog_sink.h (100%) rename src/cpp/{ => include}/deps/spdlog/sinks/wincolor_sink.h (100%) rename src/cpp/{ => include}/deps/spdlog/spdlog.h (100%) rename src/cpp/{ => include}/deps/spdlog/tweakme.h (100%) rename src/cpp/{ => include}/deps/spdlog/version.h (100%) rename src/cpp/{ => include}/deps/yoga/Bitfield.h (100%) rename src/cpp/{ => include}/deps/yoga/CompactValue.h (100%) rename src/cpp/{ => include}/deps/yoga/Utils.cpp (100%) rename src/cpp/{ => include}/deps/yoga/Utils.h (100%) rename src/cpp/{ => include}/deps/yoga/YGConfig.cpp (100%) rename src/cpp/{ => include}/deps/yoga/YGConfig.h (100%) rename src/cpp/{ => include}/deps/yoga/YGEnums.cpp (100%) rename src/cpp/{ => include}/deps/yoga/YGEnums.h (100%) rename src/cpp/{ => include}/deps/yoga/YGFloatOptional.h (100%) rename src/cpp/{ => include}/deps/yoga/YGLayout.cpp (100%) rename src/cpp/{ => include}/deps/yoga/YGLayout.h (100%) rename src/cpp/{ => include}/deps/yoga/YGMacros.h (100%) rename src/cpp/{ => include}/deps/yoga/YGNode.cpp (100%) rename src/cpp/{ => include}/deps/yoga/YGNode.h (100%) rename src/cpp/{ => include}/deps/yoga/YGNodePrint.cpp (100%) rename src/cpp/{ => include}/deps/yoga/YGNodePrint.h (100%) rename src/cpp/{ => include}/deps/yoga/YGStyle.cpp (100%) rename src/cpp/{ => include}/deps/yoga/YGStyle.h (100%) rename src/cpp/{ => include}/deps/yoga/YGValue.cpp (100%) rename src/cpp/{ => include}/deps/yoga/YGValue.h (100%) rename src/cpp/{ => include}/deps/yoga/Yoga-internal.h (100%) rename src/cpp/{ => include}/deps/yoga/Yoga.cpp (100%) rename src/cpp/{ => include}/deps/yoga/Yoga.h (100%) rename src/cpp/{ => include}/deps/yoga/event/event.cpp (100%) rename src/cpp/{ => include}/deps/yoga/event/event.h (100%) rename src/cpp/{ => include}/deps/yoga/internal/experiments-inl.h (100%) rename src/cpp/{ => include}/deps/yoga/internal/experiments.cpp (100%) rename src/cpp/{ => include}/deps/yoga/internal/experiments.h (100%) rename src/cpp/{ => include}/deps/yoga/log.cpp (100%) rename src/cpp/{ => include}/deps/yoga/log.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae5189e3b..3d4f9b513 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,18 +30,18 @@ add_library(${CORE_WIDGETS_ADDON} SHARED "${PROJECT_SOURCE_DIR}/src/cpp/lib/core/Events/eventwidget.cpp" "${PROJECT_SOURCE_DIR}/src/cpp/lib/core/YogaWidget/yogawidget.cpp" # core deps - "${PROJECT_SOURCE_DIR}/src/cpp/deps/yoga/log.cpp" - "${PROJECT_SOURCE_DIR}/src/cpp/deps/yoga/Utils.cpp" - "${PROJECT_SOURCE_DIR}/src/cpp/deps/yoga/YGConfig.cpp" - "${PROJECT_SOURCE_DIR}/src/cpp/deps/yoga/YGEnums.cpp" - "${PROJECT_SOURCE_DIR}/src/cpp/deps/yoga/YGLayout.cpp" - "${PROJECT_SOURCE_DIR}/src/cpp/deps/yoga/YGNode.cpp" - "${PROJECT_SOURCE_DIR}/src/cpp/deps/yoga/YGNodePrint.cpp" - "${PROJECT_SOURCE_DIR}/src/cpp/deps/yoga/YGStyle.cpp" - "${PROJECT_SOURCE_DIR}/src/cpp/deps/yoga/YGValue.cpp" - "${PROJECT_SOURCE_DIR}/src/cpp/deps/yoga/Yoga.cpp" - "${PROJECT_SOURCE_DIR}/src/cpp/deps/yoga/event/event.cpp" - "${PROJECT_SOURCE_DIR}/src/cpp/deps/yoga/internal/experiments.cpp" + "${PROJECT_SOURCE_DIR}/src/cpp/include/deps/yoga/log.cpp" + "${PROJECT_SOURCE_DIR}/src/cpp/include/deps/yoga/Utils.cpp" + "${PROJECT_SOURCE_DIR}/src/cpp/include/deps/yoga/YGConfig.cpp" + "${PROJECT_SOURCE_DIR}/src/cpp/include/deps/yoga/YGEnums.cpp" + "${PROJECT_SOURCE_DIR}/src/cpp/include/deps/yoga/YGLayout.cpp" + "${PROJECT_SOURCE_DIR}/src/cpp/include/deps/yoga/YGNode.cpp" + "${PROJECT_SOURCE_DIR}/src/cpp/include/deps/yoga/YGNodePrint.cpp" + "${PROJECT_SOURCE_DIR}/src/cpp/include/deps/yoga/YGStyle.cpp" + "${PROJECT_SOURCE_DIR}/src/cpp/include/deps/yoga/YGValue.cpp" + "${PROJECT_SOURCE_DIR}/src/cpp/include/deps/yoga/Yoga.cpp" + "${PROJECT_SOURCE_DIR}/src/cpp/include/deps/yoga/event/event.cpp" + "${PROJECT_SOURCE_DIR}/src/cpp/include/deps/yoga/internal/experiments.cpp" # wrapped cpps "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtGui/QApplication/qapplication_wrap.cpp" "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtGui/QClipboard/qclipboard_wrap.cpp" @@ -87,22 +87,17 @@ AddCommonConfig(${CORE_WIDGETS_ADDON}) # qt include(./config/qt.cmake) AddQtSupport(${CORE_WIDGETS_ADDON}) - # napi include(./config/napi.cmake) AddNapiSupport(${CORE_WIDGETS_ADDON}) - target_include_directories(${CORE_WIDGETS_ADDON} PRIVATE "${CMAKE_JS_INC}" "${PROJECT_SOURCE_DIR}" - "${PROJECT_SOURCE_DIR}/src/cpp/deps" - "${PROJECT_SOURCE_DIR}/src/cpp/include/nodegui" -) - -target_include_directories(${CORE_WIDGETS_ADDON} PUBLIC "${PROJECT_SOURCE_DIR}/src/cpp" "${PROJECT_SOURCE_DIR}/src/cpp/include" + "${PROJECT_SOURCE_DIR}/src/cpp/include/deps" + "${PROJECT_SOURCE_DIR}/src/cpp/include/nodegui" ) target_link_libraries(${CORE_WIDGETS_ADDON} PRIVATE diff --git a/config/plugin.cmake b/config/plugin.cmake new file mode 100644 index 000000000..53de5d2dd --- /dev/null +++ b/config/plugin.cmake @@ -0,0 +1,32 @@ +# This cmake file will be used in the plugins +set(PLUGIN_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}") +set(NODEGUI_ROOT "${PLUGIN_CMAKE_DIR}/..") +set(NODEGUI_LIBRARY "${NODEGUI_ROOT}/build/Release/nodegui_core.node") + +function(AddPluginConfig addonName) + # common + include("${PLUGIN_CMAKE_DIR}/common.cmake") + AddCommonConfig(${addonName}) + # qt + include("${PLUGIN_CMAKE_DIR}/qt.cmake") + AddQtSupport(${addonName}) + # napi + include("${PLUGIN_CMAKE_DIR}/napi.cmake") + AddNapiSupport(${addonName}) + + target_link_libraries(${addonName} PRIVATE + "${NODEGUI_LIBRARY}" + ) + + target_include_directories(${addonName} PRIVATE + "${CMAKE_JS_INC}" + "${NODEGUI_ROOT}" + "${NODEGUI_ROOT}/src/cpp" + "${NODEGUI_ROOT}/src/cpp/include" + "${NODEGUI_ROOT}/src/cpp/include/deps" + "${NODEGUI_ROOT}/src/cpp/include/nodegui" + ) + + +endfunction(AddPluginConfig addonName) + diff --git a/examples/README.md b/examples/README.md deleted file mode 100644 index 92d5c68d3..000000000 --- a/examples/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Examples - -Examples have now moved to a repo of their own - -They are all available at: - -https://github.com/nodegui/examples diff --git a/package.json b/package.json index 0ab988312..e57e31ecc 100644 --- a/package.json +++ b/package.json @@ -7,10 +7,11 @@ "files": [ "dist", "config", - "binding.gyp", + "CMakeLists.txt", "src", "extras/legal", - "deps" + "deps", + "plugin" ], "author": "Atul R ", "license": "MIT", @@ -26,6 +27,7 @@ "dependencies": { "@nodegui/qode": "^1.0.5", "cmake-js": "^5.3.2", + "cross-env": "^6.0.0", "cuid": "^2.1.6", "node-addon-api": "^1.6.3", "node-gyp": "^5.0.3", @@ -34,7 +36,6 @@ "devDependencies": { "@types/bindings": "^1.3.0", "@types/node": "^12.0.2", - "cross-env": "^6.0.0", "prettier": "^1.17.1", "serve": "^11.1.0", "typescript": "^3.4.5" diff --git a/plugin/index.js b/plugin/index.js new file mode 100644 index 000000000..f9a6e1781 --- /dev/null +++ b/plugin/index.js @@ -0,0 +1,11 @@ +const path = require("path"); + +const NODEGUI_ROOT = path.resolve(__dirname, ".."); +const CMAKE_HELPER_DIR = path.resolve(NODEGUI_ROOT, "config"); +const CMAKE_HELPER_FILE = path.resolve(CMAKE_HELPER_DIR, "plugin.cmake"); + +module.exports = { + CMAKE_HELPER_FILE, + CMAKE_HELPER_DIR, + NODEGUI_ROOT +}; diff --git a/src/cpp/deps/spdlog/async.h b/src/cpp/include/deps/spdlog/async.h similarity index 100% rename from src/cpp/deps/spdlog/async.h rename to src/cpp/include/deps/spdlog/async.h diff --git a/src/cpp/deps/spdlog/async_logger.h b/src/cpp/include/deps/spdlog/async_logger.h similarity index 100% rename from src/cpp/deps/spdlog/async_logger.h rename to src/cpp/include/deps/spdlog/async_logger.h diff --git a/src/cpp/deps/spdlog/common.h b/src/cpp/include/deps/spdlog/common.h similarity index 100% rename from src/cpp/deps/spdlog/common.h rename to src/cpp/include/deps/spdlog/common.h diff --git a/src/cpp/deps/spdlog/details/async_logger_impl.h b/src/cpp/include/deps/spdlog/details/async_logger_impl.h similarity index 100% rename from src/cpp/deps/spdlog/details/async_logger_impl.h rename to src/cpp/include/deps/spdlog/details/async_logger_impl.h diff --git a/src/cpp/deps/spdlog/details/circular_q.h b/src/cpp/include/deps/spdlog/details/circular_q.h similarity index 100% rename from src/cpp/deps/spdlog/details/circular_q.h rename to src/cpp/include/deps/spdlog/details/circular_q.h diff --git a/src/cpp/deps/spdlog/details/console_globals.h b/src/cpp/include/deps/spdlog/details/console_globals.h similarity index 100% rename from src/cpp/deps/spdlog/details/console_globals.h rename to src/cpp/include/deps/spdlog/details/console_globals.h diff --git a/src/cpp/deps/spdlog/details/file_helper.h b/src/cpp/include/deps/spdlog/details/file_helper.h similarity index 100% rename from src/cpp/deps/spdlog/details/file_helper.h rename to src/cpp/include/deps/spdlog/details/file_helper.h diff --git a/src/cpp/deps/spdlog/details/fmt_helper.h b/src/cpp/include/deps/spdlog/details/fmt_helper.h similarity index 100% rename from src/cpp/deps/spdlog/details/fmt_helper.h rename to src/cpp/include/deps/spdlog/details/fmt_helper.h diff --git a/src/cpp/deps/spdlog/details/log_msg.h b/src/cpp/include/deps/spdlog/details/log_msg.h similarity index 100% rename from src/cpp/deps/spdlog/details/log_msg.h rename to src/cpp/include/deps/spdlog/details/log_msg.h diff --git a/src/cpp/deps/spdlog/details/logger_impl.h b/src/cpp/include/deps/spdlog/details/logger_impl.h similarity index 100% rename from src/cpp/deps/spdlog/details/logger_impl.h rename to src/cpp/include/deps/spdlog/details/logger_impl.h diff --git a/src/cpp/deps/spdlog/details/mpmc_blocking_q.h b/src/cpp/include/deps/spdlog/details/mpmc_blocking_q.h similarity index 100% rename from src/cpp/deps/spdlog/details/mpmc_blocking_q.h rename to src/cpp/include/deps/spdlog/details/mpmc_blocking_q.h diff --git a/src/cpp/deps/spdlog/details/null_mutex.h b/src/cpp/include/deps/spdlog/details/null_mutex.h similarity index 100% rename from src/cpp/deps/spdlog/details/null_mutex.h rename to src/cpp/include/deps/spdlog/details/null_mutex.h diff --git a/src/cpp/deps/spdlog/details/os.h b/src/cpp/include/deps/spdlog/details/os.h similarity index 100% rename from src/cpp/deps/spdlog/details/os.h rename to src/cpp/include/deps/spdlog/details/os.h diff --git a/src/cpp/deps/spdlog/details/pattern_formatter.h b/src/cpp/include/deps/spdlog/details/pattern_formatter.h similarity index 100% rename from src/cpp/deps/spdlog/details/pattern_formatter.h rename to src/cpp/include/deps/spdlog/details/pattern_formatter.h diff --git a/src/cpp/deps/spdlog/details/periodic_worker.h b/src/cpp/include/deps/spdlog/details/periodic_worker.h similarity index 100% rename from src/cpp/deps/spdlog/details/periodic_worker.h rename to src/cpp/include/deps/spdlog/details/periodic_worker.h diff --git a/src/cpp/deps/spdlog/details/registry.h b/src/cpp/include/deps/spdlog/details/registry.h similarity index 100% rename from src/cpp/deps/spdlog/details/registry.h rename to src/cpp/include/deps/spdlog/details/registry.h diff --git a/src/cpp/deps/spdlog/details/thread_pool.h b/src/cpp/include/deps/spdlog/details/thread_pool.h similarity index 100% rename from src/cpp/deps/spdlog/details/thread_pool.h rename to src/cpp/include/deps/spdlog/details/thread_pool.h diff --git a/src/cpp/deps/spdlog/fmt/bin_to_hex.h b/src/cpp/include/deps/spdlog/fmt/bin_to_hex.h similarity index 100% rename from src/cpp/deps/spdlog/fmt/bin_to_hex.h rename to src/cpp/include/deps/spdlog/fmt/bin_to_hex.h diff --git a/src/cpp/deps/spdlog/fmt/bundled/LICENSE.rst b/src/cpp/include/deps/spdlog/fmt/bundled/LICENSE.rst similarity index 100% rename from src/cpp/deps/spdlog/fmt/bundled/LICENSE.rst rename to src/cpp/include/deps/spdlog/fmt/bundled/LICENSE.rst diff --git a/src/cpp/deps/spdlog/fmt/bundled/chrono.h b/src/cpp/include/deps/spdlog/fmt/bundled/chrono.h similarity index 100% rename from src/cpp/deps/spdlog/fmt/bundled/chrono.h rename to src/cpp/include/deps/spdlog/fmt/bundled/chrono.h diff --git a/src/cpp/deps/spdlog/fmt/bundled/color.h b/src/cpp/include/deps/spdlog/fmt/bundled/color.h similarity index 100% rename from src/cpp/deps/spdlog/fmt/bundled/color.h rename to src/cpp/include/deps/spdlog/fmt/bundled/color.h diff --git a/src/cpp/deps/spdlog/fmt/bundled/core.h b/src/cpp/include/deps/spdlog/fmt/bundled/core.h similarity index 100% rename from src/cpp/deps/spdlog/fmt/bundled/core.h rename to src/cpp/include/deps/spdlog/fmt/bundled/core.h diff --git a/src/cpp/deps/spdlog/fmt/bundled/format-inl.h b/src/cpp/include/deps/spdlog/fmt/bundled/format-inl.h similarity index 100% rename from src/cpp/deps/spdlog/fmt/bundled/format-inl.h rename to src/cpp/include/deps/spdlog/fmt/bundled/format-inl.h diff --git a/src/cpp/deps/spdlog/fmt/bundled/format.h b/src/cpp/include/deps/spdlog/fmt/bundled/format.h similarity index 100% rename from src/cpp/deps/spdlog/fmt/bundled/format.h rename to src/cpp/include/deps/spdlog/fmt/bundled/format.h diff --git a/src/cpp/deps/spdlog/fmt/bundled/locale.h b/src/cpp/include/deps/spdlog/fmt/bundled/locale.h similarity index 100% rename from src/cpp/deps/spdlog/fmt/bundled/locale.h rename to src/cpp/include/deps/spdlog/fmt/bundled/locale.h diff --git a/src/cpp/deps/spdlog/fmt/bundled/ostream.h b/src/cpp/include/deps/spdlog/fmt/bundled/ostream.h similarity index 100% rename from src/cpp/deps/spdlog/fmt/bundled/ostream.h rename to src/cpp/include/deps/spdlog/fmt/bundled/ostream.h diff --git a/src/cpp/deps/spdlog/fmt/bundled/posix.h b/src/cpp/include/deps/spdlog/fmt/bundled/posix.h similarity index 100% rename from src/cpp/deps/spdlog/fmt/bundled/posix.h rename to src/cpp/include/deps/spdlog/fmt/bundled/posix.h diff --git a/src/cpp/deps/spdlog/fmt/bundled/printf.h b/src/cpp/include/deps/spdlog/fmt/bundled/printf.h similarity index 100% rename from src/cpp/deps/spdlog/fmt/bundled/printf.h rename to src/cpp/include/deps/spdlog/fmt/bundled/printf.h diff --git a/src/cpp/deps/spdlog/fmt/bundled/ranges.h b/src/cpp/include/deps/spdlog/fmt/bundled/ranges.h similarity index 100% rename from src/cpp/deps/spdlog/fmt/bundled/ranges.h rename to src/cpp/include/deps/spdlog/fmt/bundled/ranges.h diff --git a/src/cpp/deps/spdlog/fmt/bundled/time.h b/src/cpp/include/deps/spdlog/fmt/bundled/time.h similarity index 100% rename from src/cpp/deps/spdlog/fmt/bundled/time.h rename to src/cpp/include/deps/spdlog/fmt/bundled/time.h diff --git a/src/cpp/deps/spdlog/fmt/fmt.h b/src/cpp/include/deps/spdlog/fmt/fmt.h similarity index 100% rename from src/cpp/deps/spdlog/fmt/fmt.h rename to src/cpp/include/deps/spdlog/fmt/fmt.h diff --git a/src/cpp/deps/spdlog/fmt/ostr.h b/src/cpp/include/deps/spdlog/fmt/ostr.h similarity index 100% rename from src/cpp/deps/spdlog/fmt/ostr.h rename to src/cpp/include/deps/spdlog/fmt/ostr.h diff --git a/src/cpp/deps/spdlog/formatter.h b/src/cpp/include/deps/spdlog/formatter.h similarity index 100% rename from src/cpp/deps/spdlog/formatter.h rename to src/cpp/include/deps/spdlog/formatter.h diff --git a/src/cpp/deps/spdlog/logger.h b/src/cpp/include/deps/spdlog/logger.h similarity index 100% rename from src/cpp/deps/spdlog/logger.h rename to src/cpp/include/deps/spdlog/logger.h diff --git a/src/cpp/deps/spdlog/sinks/android_sink.h b/src/cpp/include/deps/spdlog/sinks/android_sink.h similarity index 100% rename from src/cpp/deps/spdlog/sinks/android_sink.h rename to src/cpp/include/deps/spdlog/sinks/android_sink.h diff --git a/src/cpp/deps/spdlog/sinks/ansicolor_sink.h b/src/cpp/include/deps/spdlog/sinks/ansicolor_sink.h similarity index 100% rename from src/cpp/deps/spdlog/sinks/ansicolor_sink.h rename to src/cpp/include/deps/spdlog/sinks/ansicolor_sink.h diff --git a/src/cpp/deps/spdlog/sinks/base_sink.h b/src/cpp/include/deps/spdlog/sinks/base_sink.h similarity index 100% rename from src/cpp/deps/spdlog/sinks/base_sink.h rename to src/cpp/include/deps/spdlog/sinks/base_sink.h diff --git a/src/cpp/deps/spdlog/sinks/basic_file_sink.h b/src/cpp/include/deps/spdlog/sinks/basic_file_sink.h similarity index 100% rename from src/cpp/deps/spdlog/sinks/basic_file_sink.h rename to src/cpp/include/deps/spdlog/sinks/basic_file_sink.h diff --git a/src/cpp/deps/spdlog/sinks/daily_file_sink.h b/src/cpp/include/deps/spdlog/sinks/daily_file_sink.h similarity index 100% rename from src/cpp/deps/spdlog/sinks/daily_file_sink.h rename to src/cpp/include/deps/spdlog/sinks/daily_file_sink.h diff --git a/src/cpp/deps/spdlog/sinks/dist_sink.h b/src/cpp/include/deps/spdlog/sinks/dist_sink.h similarity index 100% rename from src/cpp/deps/spdlog/sinks/dist_sink.h rename to src/cpp/include/deps/spdlog/sinks/dist_sink.h diff --git a/src/cpp/deps/spdlog/sinks/msvc_sink.h b/src/cpp/include/deps/spdlog/sinks/msvc_sink.h similarity index 100% rename from src/cpp/deps/spdlog/sinks/msvc_sink.h rename to src/cpp/include/deps/spdlog/sinks/msvc_sink.h diff --git a/src/cpp/deps/spdlog/sinks/null_sink.h b/src/cpp/include/deps/spdlog/sinks/null_sink.h similarity index 100% rename from src/cpp/deps/spdlog/sinks/null_sink.h rename to src/cpp/include/deps/spdlog/sinks/null_sink.h diff --git a/src/cpp/deps/spdlog/sinks/ostream_sink.h b/src/cpp/include/deps/spdlog/sinks/ostream_sink.h similarity index 100% rename from src/cpp/deps/spdlog/sinks/ostream_sink.h rename to src/cpp/include/deps/spdlog/sinks/ostream_sink.h diff --git a/src/cpp/deps/spdlog/sinks/rotating_file_sink.h b/src/cpp/include/deps/spdlog/sinks/rotating_file_sink.h similarity index 100% rename from src/cpp/deps/spdlog/sinks/rotating_file_sink.h rename to src/cpp/include/deps/spdlog/sinks/rotating_file_sink.h diff --git a/src/cpp/deps/spdlog/sinks/sink.h b/src/cpp/include/deps/spdlog/sinks/sink.h similarity index 100% rename from src/cpp/deps/spdlog/sinks/sink.h rename to src/cpp/include/deps/spdlog/sinks/sink.h diff --git a/src/cpp/deps/spdlog/sinks/stdout_color_sinks.h b/src/cpp/include/deps/spdlog/sinks/stdout_color_sinks.h similarity index 100% rename from src/cpp/deps/spdlog/sinks/stdout_color_sinks.h rename to src/cpp/include/deps/spdlog/sinks/stdout_color_sinks.h diff --git a/src/cpp/deps/spdlog/sinks/stdout_sinks.h b/src/cpp/include/deps/spdlog/sinks/stdout_sinks.h similarity index 100% rename from src/cpp/deps/spdlog/sinks/stdout_sinks.h rename to src/cpp/include/deps/spdlog/sinks/stdout_sinks.h diff --git a/src/cpp/deps/spdlog/sinks/syslog_sink.h b/src/cpp/include/deps/spdlog/sinks/syslog_sink.h similarity index 100% rename from src/cpp/deps/spdlog/sinks/syslog_sink.h rename to src/cpp/include/deps/spdlog/sinks/syslog_sink.h diff --git a/src/cpp/deps/spdlog/sinks/wincolor_sink.h b/src/cpp/include/deps/spdlog/sinks/wincolor_sink.h similarity index 100% rename from src/cpp/deps/spdlog/sinks/wincolor_sink.h rename to src/cpp/include/deps/spdlog/sinks/wincolor_sink.h diff --git a/src/cpp/deps/spdlog/spdlog.h b/src/cpp/include/deps/spdlog/spdlog.h similarity index 100% rename from src/cpp/deps/spdlog/spdlog.h rename to src/cpp/include/deps/spdlog/spdlog.h diff --git a/src/cpp/deps/spdlog/tweakme.h b/src/cpp/include/deps/spdlog/tweakme.h similarity index 100% rename from src/cpp/deps/spdlog/tweakme.h rename to src/cpp/include/deps/spdlog/tweakme.h diff --git a/src/cpp/deps/spdlog/version.h b/src/cpp/include/deps/spdlog/version.h similarity index 100% rename from src/cpp/deps/spdlog/version.h rename to src/cpp/include/deps/spdlog/version.h diff --git a/src/cpp/deps/yoga/Bitfield.h b/src/cpp/include/deps/yoga/Bitfield.h similarity index 100% rename from src/cpp/deps/yoga/Bitfield.h rename to src/cpp/include/deps/yoga/Bitfield.h diff --git a/src/cpp/deps/yoga/CompactValue.h b/src/cpp/include/deps/yoga/CompactValue.h similarity index 100% rename from src/cpp/deps/yoga/CompactValue.h rename to src/cpp/include/deps/yoga/CompactValue.h diff --git a/src/cpp/deps/yoga/Utils.cpp b/src/cpp/include/deps/yoga/Utils.cpp similarity index 100% rename from src/cpp/deps/yoga/Utils.cpp rename to src/cpp/include/deps/yoga/Utils.cpp diff --git a/src/cpp/deps/yoga/Utils.h b/src/cpp/include/deps/yoga/Utils.h similarity index 100% rename from src/cpp/deps/yoga/Utils.h rename to src/cpp/include/deps/yoga/Utils.h diff --git a/src/cpp/deps/yoga/YGConfig.cpp b/src/cpp/include/deps/yoga/YGConfig.cpp similarity index 100% rename from src/cpp/deps/yoga/YGConfig.cpp rename to src/cpp/include/deps/yoga/YGConfig.cpp diff --git a/src/cpp/deps/yoga/YGConfig.h b/src/cpp/include/deps/yoga/YGConfig.h similarity index 100% rename from src/cpp/deps/yoga/YGConfig.h rename to src/cpp/include/deps/yoga/YGConfig.h diff --git a/src/cpp/deps/yoga/YGEnums.cpp b/src/cpp/include/deps/yoga/YGEnums.cpp similarity index 100% rename from src/cpp/deps/yoga/YGEnums.cpp rename to src/cpp/include/deps/yoga/YGEnums.cpp diff --git a/src/cpp/deps/yoga/YGEnums.h b/src/cpp/include/deps/yoga/YGEnums.h similarity index 100% rename from src/cpp/deps/yoga/YGEnums.h rename to src/cpp/include/deps/yoga/YGEnums.h diff --git a/src/cpp/deps/yoga/YGFloatOptional.h b/src/cpp/include/deps/yoga/YGFloatOptional.h similarity index 100% rename from src/cpp/deps/yoga/YGFloatOptional.h rename to src/cpp/include/deps/yoga/YGFloatOptional.h diff --git a/src/cpp/deps/yoga/YGLayout.cpp b/src/cpp/include/deps/yoga/YGLayout.cpp similarity index 100% rename from src/cpp/deps/yoga/YGLayout.cpp rename to src/cpp/include/deps/yoga/YGLayout.cpp diff --git a/src/cpp/deps/yoga/YGLayout.h b/src/cpp/include/deps/yoga/YGLayout.h similarity index 100% rename from src/cpp/deps/yoga/YGLayout.h rename to src/cpp/include/deps/yoga/YGLayout.h diff --git a/src/cpp/deps/yoga/YGMacros.h b/src/cpp/include/deps/yoga/YGMacros.h similarity index 100% rename from src/cpp/deps/yoga/YGMacros.h rename to src/cpp/include/deps/yoga/YGMacros.h diff --git a/src/cpp/deps/yoga/YGNode.cpp b/src/cpp/include/deps/yoga/YGNode.cpp similarity index 100% rename from src/cpp/deps/yoga/YGNode.cpp rename to src/cpp/include/deps/yoga/YGNode.cpp diff --git a/src/cpp/deps/yoga/YGNode.h b/src/cpp/include/deps/yoga/YGNode.h similarity index 100% rename from src/cpp/deps/yoga/YGNode.h rename to src/cpp/include/deps/yoga/YGNode.h diff --git a/src/cpp/deps/yoga/YGNodePrint.cpp b/src/cpp/include/deps/yoga/YGNodePrint.cpp similarity index 100% rename from src/cpp/deps/yoga/YGNodePrint.cpp rename to src/cpp/include/deps/yoga/YGNodePrint.cpp diff --git a/src/cpp/deps/yoga/YGNodePrint.h b/src/cpp/include/deps/yoga/YGNodePrint.h similarity index 100% rename from src/cpp/deps/yoga/YGNodePrint.h rename to src/cpp/include/deps/yoga/YGNodePrint.h diff --git a/src/cpp/deps/yoga/YGStyle.cpp b/src/cpp/include/deps/yoga/YGStyle.cpp similarity index 100% rename from src/cpp/deps/yoga/YGStyle.cpp rename to src/cpp/include/deps/yoga/YGStyle.cpp diff --git a/src/cpp/deps/yoga/YGStyle.h b/src/cpp/include/deps/yoga/YGStyle.h similarity index 100% rename from src/cpp/deps/yoga/YGStyle.h rename to src/cpp/include/deps/yoga/YGStyle.h diff --git a/src/cpp/deps/yoga/YGValue.cpp b/src/cpp/include/deps/yoga/YGValue.cpp similarity index 100% rename from src/cpp/deps/yoga/YGValue.cpp rename to src/cpp/include/deps/yoga/YGValue.cpp diff --git a/src/cpp/deps/yoga/YGValue.h b/src/cpp/include/deps/yoga/YGValue.h similarity index 100% rename from src/cpp/deps/yoga/YGValue.h rename to src/cpp/include/deps/yoga/YGValue.h diff --git a/src/cpp/deps/yoga/Yoga-internal.h b/src/cpp/include/deps/yoga/Yoga-internal.h similarity index 100% rename from src/cpp/deps/yoga/Yoga-internal.h rename to src/cpp/include/deps/yoga/Yoga-internal.h diff --git a/src/cpp/deps/yoga/Yoga.cpp b/src/cpp/include/deps/yoga/Yoga.cpp similarity index 100% rename from src/cpp/deps/yoga/Yoga.cpp rename to src/cpp/include/deps/yoga/Yoga.cpp diff --git a/src/cpp/deps/yoga/Yoga.h b/src/cpp/include/deps/yoga/Yoga.h similarity index 100% rename from src/cpp/deps/yoga/Yoga.h rename to src/cpp/include/deps/yoga/Yoga.h diff --git a/src/cpp/deps/yoga/event/event.cpp b/src/cpp/include/deps/yoga/event/event.cpp similarity index 100% rename from src/cpp/deps/yoga/event/event.cpp rename to src/cpp/include/deps/yoga/event/event.cpp diff --git a/src/cpp/deps/yoga/event/event.h b/src/cpp/include/deps/yoga/event/event.h similarity index 100% rename from src/cpp/deps/yoga/event/event.h rename to src/cpp/include/deps/yoga/event/event.h diff --git a/src/cpp/deps/yoga/internal/experiments-inl.h b/src/cpp/include/deps/yoga/internal/experiments-inl.h similarity index 100% rename from src/cpp/deps/yoga/internal/experiments-inl.h rename to src/cpp/include/deps/yoga/internal/experiments-inl.h diff --git a/src/cpp/deps/yoga/internal/experiments.cpp b/src/cpp/include/deps/yoga/internal/experiments.cpp similarity index 100% rename from src/cpp/deps/yoga/internal/experiments.cpp rename to src/cpp/include/deps/yoga/internal/experiments.cpp diff --git a/src/cpp/deps/yoga/internal/experiments.h b/src/cpp/include/deps/yoga/internal/experiments.h similarity index 100% rename from src/cpp/deps/yoga/internal/experiments.h rename to src/cpp/include/deps/yoga/internal/experiments.h diff --git a/src/cpp/deps/yoga/log.cpp b/src/cpp/include/deps/yoga/log.cpp similarity index 100% rename from src/cpp/deps/yoga/log.cpp rename to src/cpp/include/deps/yoga/log.cpp diff --git a/src/cpp/deps/yoga/log.h b/src/cpp/include/deps/yoga/log.h similarity index 100% rename from src/cpp/deps/yoga/log.h rename to src/cpp/include/deps/yoga/log.h diff --git a/src/cpp/include/nodegui/core/NodeWidget/nodewidget.h b/src/cpp/include/nodegui/core/NodeWidget/nodewidget.h index e4ca793f4..c81b193c2 100644 --- a/src/cpp/include/nodegui/core/NodeWidget/nodewidget.h +++ b/src/cpp/include/nodegui/core/NodeWidget/nodewidget.h @@ -8,7 +8,6 @@ class NodeWidget : public YogaWidget, public EventWidget { }; - #ifndef NODEWIDGET_IMPLEMENTATIONS #define NODEWIDGET_IMPLEMENTATIONS(BaseWidgetName) \ \