From 04f8e8b60a5351c21b05490ba42a4c371d98f28c Mon Sep 17 00:00:00 2001
From: Mattia Mancini <mancini@astron.nl>
Date: Thu, 20 Sep 2018 15:49:11 +0000
Subject: [PATCH] OSB-6: modified NPMInstall.cmake - missing cmake install
prefix
---
CMake/FindNPM.cmake | 2 +-
CMake/NPMInstall.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMake/FindNPM.cmake b/CMake/FindNPM.cmake
index fd0837bfda1..7a506491c59 100644
--- a/CMake/FindNPM.cmake
+++ b/CMake/FindNPM.cmake
@@ -24,7 +24,7 @@
# You should have received a copy of the GNU General Public License along
# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
#
-# $Id: FindALGLIB.cmake 21886 2012-09-04 11:57:26Z mol $
+# $Id: FindALGLIB.cmake 21886 2012-09-04 11:57:26Z mol $
if(NOT NPM_FOUND)
find_program(NPM_EXECUTABLE NAMES npm HINTS ENV/npm ${NPM_ROOT}/npm)
diff --git a/CMake/NPMInstall.cmake b/CMake/NPMInstall.cmake
index 0ba13c8fd80..28a93f96d86 100644
--- a/CMake/NPMInstall.cmake
+++ b/CMake/NPMInstall.cmake
@@ -112,7 +112,7 @@ function(npm_install NPM_PACKAGE_SPECIFICATION)
message(${NPM_INSTALL_DESTINATION})
- install(DIRECTORY ${NPM_BINARY_DIR}/build/ DESTINATION ${NPM_INSTALL_DESTINATION})
+ install(DIRECTORY ${NPM_BINARY_DIR}/build/ DESTINATION ${CMAKE_INSTALL_PREFIX}/${NPM_INSTALL_DESTINATION})
endfunction(npm_install)
--
GitLab