Hack for cross-compile

McStasMcXtrace · Jul 6, 2024 · 8bc9200 · 8bc9200
1 parent c0bce58
commit 8bc9200
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/cmake/toolchains/mingw64.cmake b/cmake/toolchains/mingw64.cmake
@@ -51,3 +51,6 @@ set(HDFVIEW "nexpy")
 # gsl and xraylib locations
 set(GSLFLAGS "-IGETPATH(../miniconda3/Library/include/) -Wl,-rpath,GETPATH(../miniconda3/Library/lib) -LGETPATH(../miniconda3/Library/lib) -lgsl -lgslcblas")
 set(XRLFLAGS "-IGETPATH(../miniconda3/Library/include/) -Wl,-rpath,GETPATH(../miniconda3/Library/lib) -LGETPATH(../miniconda3/Library/lib) -lxrl")
+
+# In cross-compile, use bare npm command
+set(NPM "npm")
diff --git a/tools/Python/mcdisplay/webgl/CMakeLists.txt b/tools/Python/mcdisplay/webgl/CMakeLists.txt
@@ -80,7 +80,9 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/package.json" "${WORK}/package.json"
 
 # Run npm to install project
 if (WINDOWS)
-  set(NPM "npm.cmd")
+  if(NOT NPM)
+    set(NPM "npm.cmd")
+  endif()
 else()
   set(NPM "npm")
 endif()