Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xdmf
Xdmf
Commits
7fdf00cd
Commit
7fdf00cd
authored
Mar 01, 2011
by
Brian Panneton
Browse files
FIX: Corrected an issue with the Versioning Suite and a Java formatting source code issue.
parent
42147d35
Changes
3
Hide whitespace changes
Inline
Side-by-side
Xdmf.i
View file @
7fdf00cd
...
...
@@ -147,16 +147,16 @@ swig -v -c++ -python -o XdmfPython.cpp Xdmf.i
System
.
loadLibrary
(
"XdmfCoreJava"
)
;
}
catch
(
UnsatisfiedLinkError
e
)
{
System
.
err
.
println
(
"Native code library failed to load for
XdmfCoreJava
\n
"
+
e
)
;
System
.
err
.
println
(
"Native code library failed to load for
"
+
"
XdmfCoreJava
\n
"
+
e
)
;
System
.
exit
(
1
)
;
}
try
{
System
.
loadLibrary
(
"XdmfJava"
)
;
}
catch
(
UnsatisfiedLinkError
e
)
{
System
.
err
.
println
(
"Native code library failed to load for
XdmfJava
\n
"
+
e
)
;
System
.
err
.
println
(
"Native code library failed to load for
"
+
"
XdmfJava
\n
"
+
e
)
;
System
.
exit
(
1
)
;
}
}
...
...
@@ -262,4 +262,4 @@ swig -v -c++ -python -o XdmfPython.cpp Xdmf.i
%
include
XdmfTime
.
hpp
%
include
XdmfTopology
.
hpp
%
include
XdmfTopologyType
.
hpp
%
include
XdmfUnstructuredGrid
.
hpp
\ No newline at end of file
%
include
XdmfUnstructuredGrid
.
hpp
core/CMakeLists.txt
View file @
7fdf00cd
...
...
@@ -2,9 +2,11 @@ project(XdmfCore)
cmake_minimum_required
(
VERSION 2.6
)
include
(
SetUpVersion
)
if
(
VERSION_CONTROL_AUTOUPDATE
)
if
(
VERSION_CONTROL_AUTOUPDATE OR
NOT EXISTS
${
CMAKE_BINARY_DIR
}
/XdmfVersion.hpp
)
VersionCreate
(
"Xdmf"
"2"
"XDMFCORE_EXPORT"
"XdmfCore.hpp"
)
endif
(
VERSION_CONTROL_AUTOUPDATE
)
endif
(
VERSION_CONTROL_AUTOUPDATE OR
NOT EXISTS
${
CMAKE_BINARY_DIR
}
/XdmfVersion.hpp
)
set
(
BUILD_SHARED_LIBS true
)
include_directories
(
${
CMAKE_CURRENT_SOURCE_DIR
}
)
...
...
core/XdmfCore.i
View file @
7fdf00cd
...
...
@@ -84,8 +84,8 @@ swig -v -c++ -python -o XdmfCorePython.cpp XdmfCore.i
System
.
loadLibrary
(
"XdmfCoreJava"
)
;
}
catch
(
UnsatisfiedLinkError
e
)
{
System
.
err
.
println
(
"Native code library failed to load for
XdmfCoreJava
\n
"
+
e
)
;
System
.
err
.
println
(
"Native code library failed to load for
"
+
"
XdmfCoreJava
\n
"
+
e
)
;
System
.
exit
(
1
)
;
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment