Skip to content

Commit

Permalink
Merge branch 'master' of github.com:nexusformat/code
Browse files Browse the repository at this point in the history
  • Loading branch information
eugenwintersberger committed Dec 16, 2015
2 parents 27a1b4d + 9ec3e3b commit 6fa9d54
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ These instructions will build everything except the applications using LIBXML2 (
- open the visual studio solution, chose either Win32 or x64 build type as appropriate, and build the project
- copy the files mxml.h mxml1.lib mxml1.dll to some other location

* Define HDF4_ROOT, HDF5_ROOT and MXML_ROOT environment variables to point to the top of each installed area
* Define HDF4_ROOT, HDF5_ROOT and MXML_ROOT Windows environment variables to point to the top of each installed area

- you should use / rather than \\ for the paths specified in these variables

Expand All @@ -159,4 +159,5 @@ These instructions will build everything except the applications using LIBXML2 (
* Browse to the build directory and open the generated NeXus.sln
* Build the solution

- If you wish to copy files to the install directory above, right click and Build the INSTALL project
- If you wish to copy files to the install directory specified above, right click and Build the INSTALL project
- If you wish to run the tests, right click and Build the RUN_TESTS project. Currently tests pick up the DLL installed above, this will be fixed later to point to the DLL in the build tree.

0 comments on commit 6fa9d54

Please sign in to comment.