Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LOFAR
Manage
Activity
Members
Labels
Plan
Issues
Wiki
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RadioObservatory
LOFAR
Commits
04f8e8b6
Commit
04f8e8b6
authored
6 years ago
by
Mattia Mancini
Browse files
Options
Downloads
Patches
Plain Diff
OSB-6
: modified NPMInstall.cmake - missing cmake install prefix
parent
cdbb79a1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!89
Monitoring maintenance Epic branch merge
,
!1
Resolve OSB-13 "Monitoringmaintenance "
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMake/FindNPM.cmake
+1
-1
1 addition, 1 deletion
CMake/FindNPM.cmake
CMake/NPMInstall.cmake
+1
-1
1 addition, 1 deletion
CMake/NPMInstall.cmake
with
2 additions
and
2 deletions
CMake/FindNPM.cmake
+
1
−
1
View file @
04f8e8b6
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
CMake/NPMInstall.cmake
+
1
−
1
View file @
04f8e8b6
...
...
@@ -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
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment