From 8d9ccce2dd34d226fbc71e8c4a8052cce6ad57d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Tue, 17 Jul 2018 13:05:52 +0300
Subject: [PATCH] Fix in-source build of MaxCtrl

The npm install command must generate the version.js file in order for the
in-source builds to work.
---
 maxctrl/CMakeLists.txt          | 2 +-
 maxctrl/configure_version.cmake | 2 ++
 maxctrl/package.json            | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 maxctrl/configure_version.cmake

diff --git a/maxctrl/CMakeLists.txt b/maxctrl/CMakeLists.txt
index 67fe828e0..4ab468542 100644
--- a/maxctrl/CMakeLists.txt
+++ b/maxctrl/CMakeLists.txt
@@ -4,7 +4,7 @@ if (BUILD_MAXCTRL)
 
   if (NPM_FOUND AND NODEJS_FOUND AND NODEJS_VERSION VERSION_GREATER "6.0.0")
 
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/version.js.in ${CMAKE_CURRENT_BINARY_DIR}/lib/version.js @ONLY)
+    include(configure_version.cmake)
 
     add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/maxctrl/maxctrl
       COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build.sh ${CMAKE_SOURCE_DIR}
diff --git a/maxctrl/configure_version.cmake b/maxctrl/configure_version.cmake
new file mode 100644
index 000000000..d8d40a87c
--- /dev/null
+++ b/maxctrl/configure_version.cmake
@@ -0,0 +1,2 @@
+include(../VERSION22.cmake)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/version.js.in ${CMAKE_CURRENT_BINARY_DIR}/lib/version.js @ONLY)
diff --git a/maxctrl/package.json b/maxctrl/package.json
index 4531d968d..43c11bbd5 100644
--- a/maxctrl/package.json
+++ b/maxctrl/package.json
@@ -5,7 +5,8 @@
   "repository": "https://github.com/mariadb-corporation/MaxScale",
   "main": "maxctrl.js",
   "scripts": {
-    "test": "nyc mocha --timeout 15000 --slow 10000"
+    "test": "nyc mocha --timeout 15000 --slow 10000",
+    "preinstall": "cmake -P configure_version.cmake"
   },
   "keywords": [
     "maxscale"