Skip to content
Snippets Groups Projects
Commit 04f8e8b6 authored by Mattia Mancini's avatar Mattia Mancini
Browse files

OSB-6: modified NPMInstall.cmake - missing cmake install prefix

parent cdbb79a1
No related branches found
No related tags found
2 merge requests!89Monitoring maintenance Epic branch merge,!1Resolve OSB-13 "Monitoringmaintenance "
Hide whitespace changes
Inline Side-by-side
CMake/FindNPM.cmake
+ 1
− 1
View file @ 04f8e8b6
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
# You should have received a copy of the GNU General Public License along # 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/>. # 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) if(NOT NPM_FOUND)
find_program(NPM_EXECUTABLE NAMES npm HINTS ENV/npm ${NPM_ROOT}/npm) find_program(NPM_EXECUTABLE NAMES npm HINTS ENV/npm ${NPM_ROOT}/npm)
......
CMake/NPMInstall.cmake
+ 1
− 1
View file @ 04f8e8b6
...@@ -112,7 +112,7 @@ function(npm_install NPM_PACKAGE_SPECIFICATION) ...@@ -112,7 +112,7 @@ function(npm_install NPM_PACKAGE_SPECIFICATION)
message(${NPM_INSTALL_DESTINATION}) 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) endfunction(npm_install)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment