From 643480240c90ebda22d1f9259b358a27dbb9e55a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Wed, 12 Sep 2018 10:19:08 +0300 Subject: [PATCH] Simplify MaxCtrl version extraction Instead of using the correct version in in-source builds, a dummy file is copied in place. This removes the need to explicitly include the VERSION.cmake file. --- maxctrl/CMakeLists.txt | 2 +- maxctrl/configure_version.cmake | 2 -- maxctrl/package.json | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 maxctrl/configure_version.cmake diff --git a/maxctrl/CMakeLists.txt b/maxctrl/CMakeLists.txt index 4ab468542..67fe828e0 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") - include(configure_version.cmake) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/version.js.in ${CMAKE_CURRENT_BINARY_DIR}/lib/version.js @ONLY) 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 deleted file mode 100644 index cba3ce999..000000000 --- a/maxctrl/configure_version.cmake +++ /dev/null @@ -1,2 +0,0 @@ -include(../VERSION.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 43c11bbd5..de5ff996d 100644 --- a/maxctrl/package.json +++ b/maxctrl/package.json @@ -6,7 +6,7 @@ "main": "maxctrl.js", "scripts": { "test": "nyc mocha --timeout 15000 --slow 10000", - "preinstall": "cmake -P configure_version.cmake" + "preinstall": "test -f lib/version.js || cp lib/version.js.in lib/version.js" }, "keywords": [ "maxscale"