10 files changed, 158 insertions, 32 deletions
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
new file mode 100644
index 0000000..034d233
--- /dev/null
+++ b/app/CMakeLists.txt
@@ -0,0 +1,57 @@
+###########################################################################
+# Copyright 2018 IoT.bzh
+#
+# author: Loïc Collignon <loic.collignon@iot.bzh>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###########################################################################
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_CXX_STANDARD 14)
+
+find_package(Qt5QuickControls2)
+find_package(Qt5WebSockets)
+
+PROJECT_TARGET_ADD(mixer)
+
+add_executable(mixer
+	main.cpp
+	mixer.cpp
+	qafbwsclient.cpp
+	qafbwsmsg.cpp
+)
+
+set_target_properties(mixer PROPERTIES
+	LABELS "EXECUTABLE"
+	PREFIX ""
+	COMPILE_FLAGS "${EXTRAS_CFLAGS} -DFOR_AFB_BINDING"
+	LINK_FLAGS "${BINDINGS_LINK_FLAG}"
+	LINK_LIBRARIES "${EXTRAS_LIBRARIES}"
+	OUTPUT_NAME "${TARGET_NAME}"
+)
+
+target_link_libraries(mixer
+	Qt5::QuickControls2
+	Qt5::WebSockets
+	homescreen
+	qtWindowmanagerWrapper
+	json-c
+)
+
+#add_custom_command(TARGET ${TARGET_NAME}
+#PRE_BUILD
+#COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/../package/htdocs
+#COMMAND cp -rv ${CMAKE_CURRENT_SOURCE_DIR}/../htdocs ${CMAKE_CURRENT_BINARY_DIR}/../package/
+#COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/../package/etc
+#COMMAND cp -rv ${CMAKE_CURRENT_SOURCE_DIR}/../etc ${CMAKE_CURRENT_BINARY_DIR}/../package/)
diff --git a/app/app.pri b/app/app.pri
deleted file mode 100644
index 014646f..0000000
--- a/app/app.pri
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE = app
-
-load(configure)
-qtCompileTest(libhomescreen)
-
-config_libhomescreen {
-    CONFIG += link_pkgconfig
-    PKGCONFIG += homescreen
-    DEFINES += HAVE_LIBHOMESCREEN
-}
-
-DESTDIR = $${OUT_PWD}/../package/root/bin
diff --git a/app/app.pro b/app/app.pro
deleted file mode 100644
index 239dc8f..0000000
--- a/app/app.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-TARGET = mixer
-QT = quickcontrols2 websockets core
-
-HEADERS += \
-    mixer.h \
-    qafbwsmsg.h \
-    qafbwsclient.h
-
-SOURCES = main.cpp \
-    mixer.cpp \
-    qafbwsclient.cpp \
-    qafbwsmsg.cpp
-
-CONFIG += link_pkgconfig
-PKGCONFIG += libhomescreen qlibwindowmanager libpulse
-
-RESOURCES += \
-    Mixer.qrc
-
-include(app.pri)
diff --git a/app/main.cpp b/app/main.cpp
index a0a5667..9c6339f 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016 The Qt Company Ltd.
  * Copyright (C) 2016,2017 Konsulko Group
+ * Copyright (C) 2018 IoT.bzh
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/mixer.cpp b/app/mixer.cpp
index 8c2d2af..adaad81 100644
--- a/app/mixer.cpp
+++ b/app/mixer.cpp
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2016 The Qt Company Ltd.
+ * Copyright (C) 2016,2017 Konsulko Group
+ * Copyright (C) 2018 IoT.bzh
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #include <QJsonArray>
 #include <QJsonObject>
 #include <QtDebug>
diff --git a/app/mixer.h b/app/mixer.h
index 2c25562..b09e1c0 100644
--- a/app/mixer.h
+++ b/app/mixer.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2016 The Qt Company Ltd.
+ * Copyright (C) 2016,2017 Konsulko Group
+ * Copyright (C) 2018 IoT.bzh
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #ifndef MIXER_H
 #define MIXER_H
 
diff --git a/app/qafbwsclient.cpp b/app/qafbwsclient.cpp
index 2816907..633a66f 100644
--- a/app/qafbwsclient.cpp
+++ b/app/qafbwsclient.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2018 IoT.bzh
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #include "qafbwsclient.h"
 #include "qafbwsmsg.h"
 #include <QJsonDocument>
diff --git a/app/qafbwsclient.h b/app/qafbwsclient.h
index 2576ecb..ac458b7 100644
--- a/app/qafbwsclient.h
+++ b/app/qafbwsclient.h
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2018 IoT.bzh
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #ifndef QAFBWSCLIENT_H
 #define QAFBWSCLIENT_H
 
diff --git a/app/qafbwsmsg.cpp b/app/qafbwsmsg.cpp
index 3f07cb0..44d0f1b 100644
--- a/app/qafbwsmsg.cpp
+++ b/app/qafbwsmsg.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2018 IoT.bzh
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #include "qafbwsmsg.h"
 
 QAfbWsMsg::QAfbWsMsg(int callId, const QString& api, const QString& verb, QObject* parent)
diff --git a/app/qafbwsmsg.h b/app/qafbwsmsg.h
index 6acce59..1ad9298 100644
--- a/app/qafbwsmsg.h
+++ b/app/qafbwsmsg.h
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2018 IoT.bzh
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #ifndef QAFBWSMSG_H
 #define QAFBWSMSG_H