Merge pull request #26 from StrangeHome/hm/gui

.gitignore

@@ -201,6 +201,60 @@ Latest commit 7293c14 on May 14
  58 contributors
 @stuartpb@shiftkey@SimonSiefke@TennyZhuang@venatoria@ro31337@Richienb@melonmanchan@gouthamve@jucrouzet@cheddar@arcresu
 116 lines (86 sloc)  1.77 KB
+# C++ objects and libs
+*.slo
+*.lo
+*.o
+*.a
+*.la
+*.lai
+*.so
+*.so.*
+*.dll
+*.dylib
+
+# Qt-es
+object_script.*.Release
+object_script.*.Debug
+*_plugin_import.cpp
+/.qmake.cache
+/.qmake.stash
+*.pro.user
+*.pro.user.*
+*.qbs.user
+*.qbs.user.*
+*.moc
+moc_*.cpp
+moc_*.h
+qrc_*.cpp
+ui_*.h
+*.qmlc
+*.jsc
+Makefile*
+*build-*
+*.qm
+*.prl
+
+# Qt unit tests
+target_wrapper.*
+
+# QtCreator
+*.autosave
+
+# QtCreator Qml
+*.qmlproject.user
+*.qmlproject.user.*
+
+# QtCreator CMake
+CMakeLists.txt.user*
+
+# QtCreator 4.8< compilation database
+compile_commands.json
+
+# QtCreator local machine specific files for imported projects
+*creator.user*
+
+*_qmlcache.qrc
 
 # Logs
 logs
@@ -329,3 +383,4 @@ API
 Training
 Blog
 About
+.pnp.*

CMakeLists.txt

@@ -47,10 +47,9 @@ option(INCLUDE_SMARTHOME_EXAMPLES "Include smarthome distribution examples." ${S
 option(INCLUDE_SMARTHOME_TESTS "Include smarthome distribution tests." ${SMARTHOME_MASTER_PROJECT})
 
 option(INCLUDE_DEVICE_PACKAGE "Include device package." ${SMARTHOME_MASTER_PROJECT})
-option(INCLUDE_GUI_PACKAGE "Include graphical user-interface package." ${SMARTHOME_MASTER_PROJECT})
 option(INCLUDE_SENSOR_PACKAGE "Include sensor package." ${SMARTHOME_MASTER_PROJECT})
 
-set(SMARTHOME_PACKAGE_DEPENDENCIES "git" "clang" "build-essential")
+set(SMARTHOME_PACKAGE_DEPENDENCIES "git" "clang" "build-essential" "nodejs" "npm")
 
 add_subdirectory("core")
 add_subdirectory("logger")
@@ -59,10 +58,6 @@ if(INCLUDE_DEVICE_PACKAGE)
 	add_subdirectory("device")
 endif()
 
-if(INCLUDE_GUI_PACKAGE)
-	add_subdirectory("gui")
-endif()
-
 if(INCLUDE_SENSOR_PACKAGE)
 	add_subdirectory("sensor")
 endif()