Skip to content

Commit dfce8bc

Browse files
zjttoefszjttoefs
committed
Merge branch 'master' of github.com:nexusformat/code
2 parents 6de43d7 + 122a854 commit dfce8bc

36 files changed

Lines changed: 2809 additions & 2750 deletions

‎CMakeLists.txt‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ option(ENABLE_FORTRAN77 "Build the Fortran 77 bindings" OFF)
9595
option(ENABLE_JAVA "Build Java bindings" OFF)
9696
option(ENABLE_CXX "Build C++ bindings" OFF)
9797
option(ENABLE_APPS "Build utility applications" OFF)
98+
option(ENABLE_NXINTER "Build Tcl-Swig Binding" OFF)
9899

99100
#show this only on Windows systems
100101
if(CMAKE_HOST_WIN32)
@@ -169,14 +170,16 @@ if(ENABLE_HDF5)
169170
else()
170171
find_package ( HDF5 REQUIRED )
171172
endif()
173+
174+
find_package(ZLIB)
172175

173176
# Hide annoying and confusing "HDF5_DIR-NOTFOUND" in CMake-GUI
174177
if (HDF5_DIR STREQUAL "HDF5_DIR-NOTFOUND")
175178
unset (HDF5_DIR CACHE)
176179
endif()
177180

178181
set(HAVE_HDF5 1)
179-
list(APPEND NAPI_LINK_LIBS ${HDF5_LIBRARIES})
182+
list(APPEND NAPI_LINK_LIBS ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES})
180183
set(WITH_HDF5 TRUE)
181184

182185
message(STATUS "HDF5 library found in: ${HDF5_LIBRARY_DIRS}")
@@ -209,11 +212,14 @@ endif()
209212
#include(cmake_include/FindSZIP.cmake)
210213
#include(cmake_include/FindAnt.cmake)
211214

215+
if(ENABLE_NXINTER)
216+
find_package(SWIG REQUIRED)
217+
find_package(TCL REQUIRED)
218+
endif()
219+
212220
#find_package(XMLRPC)
213221
find_package(ZLIB)
214222
find_package(LibXml2)
215-
#find_package(SWIG)
216-
#find_package(TCL)
217223
#find_package(LATEX)
218224
#find_package(PythonInterp)
219225

‎InstallerBits/Licences/COPYING.rtf‎

Lines changed: 130 additions & 130 deletions
Large diffs are not rendered by default.

‎InstallerBits/Licences/COPYING_hdf4.txt‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
1-
------------------------------------------------------------------
2-
3-
Copyright Notice and Statement for NCSA Hierarchical Data Format (HDF)
4-
Software Library and Utilities
5-
6-
Copyright 1988-2005 The Board of Trustees of the University of Illinois
7-
8-
All rights reserved.
9-
10-
Contributors: National Center for Supercomputing Applications
11-
(NCSA) at the University of Illinois, Fortner Software, Unidata
12-
Program Center (netCDF), The Independent JPEG Group (JPEG),
13-
Jean-loup Gailly and Mark Adler (gzip), and Digital Equipment
14-
Corporation (DEC).
15-
16-
Redistribution and use in source and binary forms, with or without
17-
modification, are permitted for any purpose (including commercial
18-
purposes) provided that the following conditions are met:
19-
20-
1. Redistributions of source code must retain the above copyright
21-
notice, this list of conditions, and the following disclaimer.
22-
23-
2. Redistributions in binary form must reproduce the above copyright
24-
notice, this list of conditions, and the following disclaimer in the
25-
documentation and/or materials provided with the distribution.
26-
27-
3. In addition, redistributions of modified forms of the source or
28-
binary code must carry prominent notices stating that the original
29-
code was changed and the date of the change.
30-
31-
4. All publications or advertising materials mentioning features or use
32-
of this software are asked, but not required, to acknowledge that it was
33-
developed by the National Center for Supercomputing Applications at the
34-
University of Illinois at Urbana-Champaign and credit the contributors.
35-
36-
5. Neither the name of the University nor the names of the Contributors
37-
may be used to endorse or promote products derived from this software
38-
without specific prior written permission from the University or the
39-
Contributors.
40-
41-
DISCLAIMER
42-
43-
THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY AND THE CONTRIBUTORS "AS IS"
44-
WITH NO WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED. In no event
45-
shall the University or the Contributors be liable for any damages
46-
suffered by the users arising out of the use of this software, even if
47-
advised of the possibility of such damage.
48-
49-
50-
51-
1+
------------------------------------------------------------------
2+
3+
Copyright Notice and Statement for NCSA Hierarchical Data Format (HDF)
4+
Software Library and Utilities
5+
6+
Copyright 1988-2005 The Board of Trustees of the University of Illinois
7+
8+
All rights reserved.
9+
10+
Contributors: National Center for Supercomputing Applications
11+
(NCSA) at the University of Illinois, Fortner Software, Unidata
12+
Program Center (netCDF), The Independent JPEG Group (JPEG),
13+
Jean-loup Gailly and Mark Adler (gzip), and Digital Equipment
14+
Corporation (DEC).
15+
16+
Redistribution and use in source and binary forms, with or without
17+
modification, are permitted for any purpose (including commercial
18+
purposes) provided that the following conditions are met:
19+
20+
1. Redistributions of source code must retain the above copyright
21+
notice, this list of conditions, and the following disclaimer.
22+
23+
2. Redistributions in binary form must reproduce the above copyright
24+
notice, this list of conditions, and the following disclaimer in the
25+
documentation and/or materials provided with the distribution.
26+
27+
3. In addition, redistributions of modified forms of the source or
28+
binary code must carry prominent notices stating that the original
29+
code was changed and the date of the change.
30+
31+
4. All publications or advertising materials mentioning features or use
32+
of this software are asked, but not required, to acknowledge that it was
33+
developed by the National Center for Supercomputing Applications at the
34+
University of Illinois at Urbana-Champaign and credit the contributors.
35+
36+
5. Neither the name of the University nor the names of the Contributors
37+
may be used to endorse or promote products derived from this software
38+
without specific prior written permission from the University or the
39+
Contributors.
40+
41+
DISCLAIMER
42+
43+
THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY AND THE CONTRIBUTORS "AS IS"
44+
WITH NO WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED. In no event
45+
shall the University or the Contributors be liable for any damages
46+
suffered by the users arising out of the use of this software, even if
47+
advised of the possibility of such damage.
48+
49+
50+
51+

‎InstallerBits/Licences/COPYING_hdf5.txt‎

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,74 @@
1-
Copyright Notice and Statement for NCSA Hierarchical Data Format (HDF)
2-
Software Library and Utilities
3-
4-
NCSA HDF5 (Hierarchical Data Format 5) Software Library and Utilities
5-
Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the Board of
6-
Trustees of the University of Illinois. All rights reserved.
7-
8-
Contributors: National Center for Supercomputing Applications (NCSA) at the
9-
University of Illinois at Urbana-Champaign (UIUC), Lawrence Livermore
10-
National Laboratory (LLNL), Sandia National Laboratories (SNL), Los Alamos
11-
National Laboratory (LANL), Jean-loup Gailly and Mark Adler (gzip library).
12-
13-
Redistribution and use in source and binary forms, with or without
14-
modification, are permitted for any purpose (including commercial purposes)
15-
provided that the following conditions are met:
16-
17-
1. Redistributions of source code must retain the above copyright notice,
18-
this list of conditions, and the following disclaimer.
19-
20-
2. Redistributions in binary form must reproduce the above copyright notice,
21-
this list of conditions, and the following disclaimer in the documentation
22-
and/or materials provided with the distribution.
23-
24-
3. In addition, redistributions of modified forms of the source or binary
25-
code must carry prominent notices stating that the original code was
26-
changed and the date of the change.
27-
28-
4. All publications or advertising materials mentioning features or use of
29-
this software are asked, but not required, to acknowledge that it was
30-
developed by the National Center for Supercomputing Applications at the
31-
University of Illinois at Urbana-Champaign and to credit the contributors.
32-
33-
5. Neither the name of the University nor the names of the Contributors may
34-
be used to endorse or promote products derived from this software without
35-
specific prior written permission from the University or the Contributors,
36-
as appropriate for the name(s) to be used.
37-
38-
6. THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY AND THE CONTRIBUTORS "AS IS"
39-
WITH NO WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED. In no event
40-
shall the University or the Contributors be liable for any damages
41-
suffered by the users arising out of the use of this software, even if
42-
advised of the possibility of such damage.
43-
44-
--------------------------------------------------------------------------
45-
Portions of HDF5 were developed with support from the University of
46-
California, Lawrence Livermore National Laboratory (UC LLNL).
47-
The following statement applies to those portions of the product
48-
and must be retained in any redistribution of source code, binaries,
49-
documentation, and/or accompanying materials:
50-
51-
This work was partially produced at the University of California,
52-
Lawrence Livermore National Laboratory (UC LLNL) under contract no.
53-
W-7405-ENG-48 (Contract 48) between the U.S. Department of Energy
54-
(DOE) and The Regents of the University of California (University)
55-
for the operation of UC LLNL.
56-
57-
DISCLAIMER:
58-
This work was prepared as an account of work sponsored by an agency
59-
of the United States Government. Neither the United States
60-
Government nor the University of California nor any of their
61-
employees, makes any warranty, express or implied, or assumes any
62-
liability or responsibility for the accuracy, completeness, or
63-
usefulness of any information, apparatus, product, or process
64-
disclosed, or represents that its use would not infringe privately-
65-
owned rights. Reference herein to any specific commercial products,
66-
process, or service by trade name, trademark, manufacturer, or
67-
otherwise, does not necessarily constitute or imply its endorsement,
68-
recommendation, or favoring by the United States Government or the
69-
University of California. The views and opinions of authors
70-
expressed herein do not necessarily state or reflect those of the
71-
United States Government or the University of California, and shall
72-
not be used for advertising or product endorsement purposes.
73-
--------------------------------------------------------------------------
74-
1+
Copyright Notice and Statement for NCSA Hierarchical Data Format (HDF)
2+
Software Library and Utilities
3+
4+
NCSA HDF5 (Hierarchical Data Format 5) Software Library and Utilities
5+
Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the Board of
6+
Trustees of the University of Illinois. All rights reserved.
7+
8+
Contributors: National Center for Supercomputing Applications (NCSA) at the
9+
University of Illinois at Urbana-Champaign (UIUC), Lawrence Livermore
10+
National Laboratory (LLNL), Sandia National Laboratories (SNL), Los Alamos
11+
National Laboratory (LANL), Jean-loup Gailly and Mark Adler (gzip library).
12+
13+
Redistribution and use in source and binary forms, with or without
14+
modification, are permitted for any purpose (including commercial purposes)
15+
provided that the following conditions are met:
16+
17+
1. Redistributions of source code must retain the above copyright notice,
18+
this list of conditions, and the following disclaimer.
19+
20+
2. Redistributions in binary form must reproduce the above copyright notice,
21+
this list of conditions, and the following disclaimer in the documentation
22+
and/or materials provided with the distribution.
23+
24+
3. In addition, redistributions of modified forms of the source or binary
25+
code must carry prominent notices stating that the original code was
26+
changed and the date of the change.
27+
28+
4. All publications or advertising materials mentioning features or use of
29+
this software are asked, but not required, to acknowledge that it was
30+
developed by the National Center for Supercomputing Applications at the
31+
University of Illinois at Urbana-Champaign and to credit the contributors.
32+
33+
5. Neither the name of the University nor the names of the Contributors may
34+
be used to endorse or promote products derived from this software without
35+
specific prior written permission from the University or the Contributors,
36+
as appropriate for the name(s) to be used.
37+
38+
6. THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY AND THE CONTRIBUTORS "AS IS"
39+
WITH NO WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED. In no event
40+
shall the University or the Contributors be liable for any damages
41+
suffered by the users arising out of the use of this software, even if
42+
advised of the possibility of such damage.
43+
44+
--------------------------------------------------------------------------
45+
Portions of HDF5 were developed with support from the University of
46+
California, Lawrence Livermore National Laboratory (UC LLNL).
47+
The following statement applies to those portions of the product
48+
and must be retained in any redistribution of source code, binaries,
49+
documentation, and/or accompanying materials:
50+
51+
This work was partially produced at the University of California,
52+
Lawrence Livermore National Laboratory (UC LLNL) under contract no.
53+
W-7405-ENG-48 (Contract 48) between the U.S. Department of Energy
54+
(DOE) and The Regents of the University of California (University)
55+
for the operation of UC LLNL.
56+
57+
DISCLAIMER:
58+
This work was prepared as an account of work sponsored by an agency
59+
of the United States Government. Neither the United States
60+
Government nor the University of California nor any of their
61+
employees, makes any warranty, express or implied, or assumes any
62+
liability or responsibility for the accuracy, completeness, or
63+
usefulness of any information, apparatus, product, or process
64+
disclosed, or represents that its use would not infringe privately-
65+
owned rights. Reference herein to any specific commercial products,
66+
process, or service by trade name, trademark, manufacturer, or
67+
otherwise, does not necessarily constitute or imply its endorsement,
68+
recommendation, or favoring by the United States Government or the
69+
University of California. The views and opinions of authors
70+
expressed herein do not necessarily state or reflect those of the
71+
United States Government or the University of California, and shall
72+
not be used for advertising or product endorsement purposes.
73+
--------------------------------------------------------------------------
74+

0 commit comments

Comments
 (0)