Skip to content

Commit

Permalink
Merge in changes from [949] to [953] on 4.0 branch
Browse files Browse the repository at this point in the history
to main trunk. These were:
* Absoft compiler issue (#68)
* Correct cygwin documentation (#85)

Refs #78.



git-svn-id: https://svn.nexusformat.org/code/trunk@954 ff5d1e40-2be0-497f-93bd-dc18237bd3c7
  • Loading branch information
FreddieAkeroyd authored and Freddie Akeroyd committed Aug 24, 2007
1 parent 56be743 commit a04d4d0
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
21 changes: 12 additions & 9 deletions README.cygwin
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
Set you PATH with
The NeXus source code should build under cygwin, but note that
HDF4 may not work (HDF5 and XML are fine). When building the HDF5
library you may want to specify an explicit prefix for the
install location e.g.

export PATH=/usr/autotools/devel/bin:$PATH
./configure --prefix=/usr/local/hdf5 # for building HDF5

the default "stable" autotools provided are not recent enough
and you will get problems if you have to run autoconf/autoheader/automake
or "autogen.sh"
Otherwise you will need to configure NeXus with

You need to install the hdf libraries - you can download a pre-compiled
version from:

http://nexus.isis.rl.ac.uk/kits/cygwin
./configure --with=hdf5=/path/to/where/hdf5/went # for building NeXus

or it will not be able to locate the HDF5 libraries.

Alternatively there is a native Windows kit available
from http://download.nexusformat.org/kits/windows that supports
HDF4/HDF5/XML and building applications under both Visual Studio
and MinGW
2 changes: 1 addition & 1 deletion test/NXtest.f90
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ program NXtest
if (NXputslab(fileid, r8_buffer, (/1,1/), (/4,4/)) /= NX_OK) stop
if (NXputattr(fileid, "ch_attribute", "NeXus") /= NX_OK) stop
if (NXputattr(fileid, "i4_attribute", 42) /= NX_OK) stop
if (NXputattr(fileid, "r4_attribute", 3.14159265) /= NX_OK) stop
if (NXputattr(fileid, "r4_attribute", 3.141593_NXr4) /= NX_OK) stop
if (NXgetdataID(fileid, dlink) /= NX_OK) stop
if (NXclosedata(fileid) /= NX_OK) stop
if (NXmakegroup(fileid, "data", "NXdata") /= NX_OK) stop
Expand Down
2 changes: 1 addition & 1 deletion test/testsuite.at
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ Group: entry(NXentry) contains 8 items
: 17.0000000 18.0000000 19.0000000 20.0000000
ch_attribute : NeXus
i4_attribute : 42
r4_attribute : 3.1415927
r4_attribute : 3.1415930
target : /entry/r8_data
Subgroup: sample(NXsample)
Link Check OK
Expand Down

0 comments on commit a04d4d0

Please sign in to comment.