From c74fa1c7f0e85075fc9431f839c1b84f7845955b Mon Sep 17 00:00:00 2001
From: Atul R <atulanand94@gmail.com>
Date: Mon, 24 Feb 2020 21:34:00 +0100
Subject: [PATCH] fix qt config and compilation

---
 config/qtConfig.js | 10 ++++++----
 package.json       |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/config/qtConfig.js b/config/qtConfig.js
index a593b8242..7d4e608eb 100644
--- a/config/qtConfig.js
+++ b/config/qtConfig.js
@@ -9,7 +9,6 @@ function getMiniQtConfig() {
         case 'darwin': {
             return {
                 qtHome: path.resolve(SETUP_DIR, QT_VERSION, 'clang_64'),
-                version: QT_VERSION,
                 artifacts: [
                     {
                         name: 'Qt Base',
@@ -21,7 +20,6 @@ function getMiniQtConfig() {
         case 'win32': {
             return {
                 qtHome: path.resolve(SETUP_DIR, QT_VERSION, 'msvc2017_64'),
-                version: QT_VERSION,
                 artifacts: [
                     {
                         name: 'Qt Base',
@@ -33,7 +31,6 @@ function getMiniQtConfig() {
         case 'linux': {
             return {
                 qtHome: path.resolve(SETUP_DIR, QT_VERSION, 'gcc_64'),
-                version: QT_VERSION,
                 artifacts: [
                     {
                         name: 'Qt Base',
@@ -49,7 +46,12 @@ function getMiniQtConfig() {
     }
 }
 
-const miniQt = getMiniQtConfig();
+const miniQt = {
+    ...getMiniQtConfig(),
+    version: QT_VERSION,
+    setupDir: SETUP_DIR,
+};
+
 const useCustomQt = Boolean(process.env.QT_INSTALL_DIR);
 const qtHome = useCustomQt ? process.env.QT_INSTALL_DIR : miniQt.qtHome;
 const qtCmakeDir = path.resolve(qtHome, 'lib', 'cmake', 'Qt5');
diff --git a/package.json b/package.json
index 7469d9a69..98b7db58b 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
         "build": "cross-env tsc && npm run build:addon",
         "postinstall": "cross-env npm run setupqt && (node ./scripts/skip.js || npm run prebuild:install || npm run build:addon)",
         "setupqt": "node ./scripts/setupMiniQt.js",
-        "build:addon": "cross-env CMAKE_BUILD_PARALLEL_LEVEL=8 cmake-js build",
+        "build:addon": "cross-env CMAKE_BUILD_PARALLEL_LEVEL=8 cmake-js compile",
         "prebuild:install": "prebuild-install --backend=cmake-js --runtime=napi --verbose",
         "test": "qode ./node_modules/jest/bin/jest -i",
         "lint:cpp": "clang-format -i --glob=src/cpp/**/*.[h,c]*",