Commit 7fdf00cd authored by Brian Panneton's avatar Brian Panneton
Browse files

FIX: Corrected an issue with the Versioning Suite and a Java formatting source code issue.

parent 42147d35
......@@ -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
......@@ -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})
......
......@@ -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);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment