Skip to content

Commit f8b7f83

Browse files
committed
Add new library for Matlab dataio modules
1 parent e621deb commit f8b7f83

12 files changed

+1348
-0
lines changed

src/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,7 @@ SET_PROPERTY(TARGET Modules_Visualization PROPERTY FOLDER "Modules/Visualizati
625625
SET_PROPERTY(TARGET Modules_BrainStimulator PROPERTY FOLDER "Modules/Brain")
626626
SET_PROPERTY(TARGET Modules_Legacy_FiniteElements PROPERTY FOLDER "Modules/FiniteElements")
627627
SET_PROPERTY(TARGET Modules_Legacy_Fields PROPERTY FOLDER "Modules/Fields")
628+
SET_PROPERTY(TARGET Modules_Legacy_Matlab_DataIO PROPERTY FOLDER "Modules/DataIO")
628629
SET_PROPERTY(TARGET Modules_Factory PROPERTY FOLDER "Modules")
629630

630631
IF(BUILD_TESTING)
@@ -678,6 +679,7 @@ IF(BUILD_TESTING)
678679
SET_PROPERTY(TARGET Modules_Render_Tests PROPERTY FOLDER "Modules/Render")
679680
SET_PROPERTY(TARGET Modules_String_Tests PROPERTY FOLDER "Modules/String")
680681
SET_PROPERTY(TARGET Modules_Visualization_Tests PROPERTY FOLDER "Modules/Visualization")
682+
SET_PROPERTY(TARGET Modules_Legacy_Matlab_DataIO_Tests PROPERTY FOLDER "Modules/DataIO")
681683
ENDIF()
682684

683685
SET_PROPERTY(TARGET Boost_external PROPERTY FOLDER "Externals")

src/Modules/Legacy/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@ ADD_SUBDIRECTORY(Math)
3232
ADD_SUBDIRECTORY(FiniteElements)
3333
#ADD_SUBDIRECTORY(String)
3434
ADD_SUBDIRECTORY(Bundle)
35+
ADD_SUBDIRECTORY(Matlab)
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#
2+
# For more information, please see: http://software.sci.utah.edu
3+
#
4+
# The MIT License
5+
#
6+
# Copyright (c) 2009 Scientific Computing and Imaging Institute,
7+
# University of Utah.
8+
#
9+
#
10+
# Permission is hereby granted, free of charge, to any person obtaining a
11+
# copy of this software and associated documentation files (the "Software"),
12+
# to deal in the Software without restriction, including without limitation
13+
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
14+
# and/or sell copies of the Software, and to permit persons to whom the
15+
# Software is furnished to do so, subject to the following conditions:
16+
#
17+
# The above copyright notice and this permission notice shall be included
18+
# in all copies or substantial portions of the Software.
19+
#
20+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
21+
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
22+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
23+
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
24+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
25+
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
26+
# DEALINGS IN THE SOFTWARE.
27+
#
28+
29+
# CMakeLists.txt for Packages/MatlabInterface/Dataflow/Modules
30+
31+
ADD_SUBDIRECTORY(DataIO)
32+
#ADD_SUBDIRECTORY(Interface)
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
#
2+
# For more information, please see: http://software.sci.utah.edu
3+
#
4+
# The MIT License
5+
#
6+
# Copyright (c) 2009 Scientific Computing and Imaging Institute,
7+
# University of Utah.
8+
#
9+
#
10+
# Permission is hereby granted, free of charge, to any person obtaining a
11+
# copy of this software and associated documentation files (the "Software"),
12+
# to deal in the Software without restriction, including without limitation
13+
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
14+
# and/or sell copies of the Software, and to permit persons to whom the
15+
# Software is furnished to do so, subject to the following conditions:
16+
#
17+
# The above copyright notice and this permission notice shall be included
18+
# in all copies or substantial portions of the Software.
19+
#
20+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
21+
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
22+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
23+
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
24+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
25+
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
26+
# DEALINGS IN THE SOFTWARE.
27+
#
28+
29+
# CMakeLists.txt for Packages/MatlabInterface/Dataflow/Modules/DataIO
30+
31+
SET(Modules_Legacy_Matlab_DataIO_SRCS
32+
ImportDatatypesFromMatlab.cc
33+
#ExportDatatypesToMatlab.cc
34+
)
35+
36+
SET(Modules_Legacy_Matlab_DataIO_HEADERS
37+
ImportDatatypesFromMatlab.h
38+
#ExportDatatypesToMatlab.h
39+
share.h
40+
)
41+
42+
ADD_LIBRARY(Modules_Legacy_Matlab_DataIO
43+
${Modules_Legacy_Matlab_DataIO_SRCS}
44+
${Modules_Legacy_Matlab_DataIO_HEADERS}
45+
)
46+
47+
TARGET_LINK_LIBRARIES(Modules_Legacy_Matlab_DataIO
48+
Core_Persistent
49+
#Core_Util
50+
#Core_Exceptions
51+
Core_Thread
52+
#Dataflow_GuiInterface
53+
Core_Datatypes
54+
Core_Geometry
55+
#Core_GeomInterface
56+
#Dataflow_TkExtensions
57+
#Dataflow_Network
58+
#Core_XMLUtil
59+
Core_Matlab
60+
#Core_Services
61+
#Core_ICom
62+
#Core_SystemCall
63+
${SCI_TEEM_LIBRARY}
64+
${SCI_ZLIB_LIBRARY}
65+
# ${M_LIBRARY}
66+
#${TK_LIBRARY}
67+
#${GL_LIBRARY}
68+
)
69+
70+
IF(BUILD_SHARED_LIBS)
71+
ADD_DEFINITIONS(-DBUILD_Modules_Legacy_Matlab_DataIO)
72+
ENDIF(BUILD_SHARED_LIBS)
73+
74+
SCIRUN_ADD_TEST_DIR(Tests)

0 commit comments

Comments
 (0)