plastichub/nodeguy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #113 from nodegui/cleanup/ng

Browse Source 
Clean up the configs a bit more
This commit is contained in:
Atul R 2019-09-22 15:20:31 +02:00 committed by GitHub
commit b662cd160a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CMakeLists.txt
View File

@ -1,19 +1,10 @@
cmake_minimum_required(VERSION 3.1)
if(${CMAKE_VERSION} VERSION_LESS 3.15)
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
else()
cmake_policy(VERSION 3.15)
endif()
set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Need for automatic moc. Moc executable path is set in qt.cmake
set(CMAKE_AUTOMOC ON)
set(QT_VERSION_MAJOR 5)
add_executable(Qt5::moc IMPORTED)
include(./config/common.cmake)
include(./config/qt.cmake)
include(./config/napi.cmake)
project(NodeGUI
VERSION 1.0
)
project(NodeGUI VERSION 1.0)
set(CORE_WIDGETS_ADDON "nodegui_core")
# ---------------------------------------
@ -81,14 +72,8 @@ add_library(${CORE_WIDGETS_ADDON} SHARED
"${PROJECT_SOURCE_DIR}/src/cpp/include/nodegui/QtWidgets/QTabWidget/ntabwidget.hpp"
)
# common
include(./config/common.cmake)
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

11
config/plugin.cmake
View File

@ -3,15 +3,13 @@ set(PLUGIN_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}")
set(NODEGUI_ROOT "${PLUGIN_CMAKE_DIR}/..")
set(NODEGUI_LIBRARY "${NODEGUI_ROOT}/build/Release/nodegui_core.node")
include("${PLUGIN_CMAKE_DIR}/common.cmake")
include("${PLUGIN_CMAKE_DIR}/qt.cmake")
include("${PLUGIN_CMAKE_DIR}/napi.cmake")
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
@ -27,6 +25,5 @@ function(AddPluginConfig addonName)
"${NODEGUI_ROOT}/src/cpp/include/nodegui"
)
endfunction(AddPluginConfig addonName)

6
config/qt.cmake
View File

@ -1,4 +1,10 @@
# Adds Qt support
# make sure you include this at the top of whichever Cmakelist file you are going to use.
# Need for automatic moc. Moc executable path is set in qt.cmake
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(QT_VERSION_MAJOR 5)
add_executable(Qt5::moc IMPORTED)
function(AddQtSupport addonName)
execute_process(COMMAND node -p "require('@nodegui/qode').qtHome"