diff --git a/CMake/FindNPM.cmake b/CMake/FindNPM.cmake index fd0837bfda150ad374c7720fac3ced48b6388d52..7a506491c597e7cf4f301e9a84b1a9f95ca5daf5 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 0ba13c8fd80df31d8be2758ce839ed8e712a91d8..28a93f96d8665534a5a4ec0fd094b632d4e2e43c 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)