Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xdmf
Xdmf
Commits
f87db327
Commit
f87db327
authored
Sep 08, 2010
by
Kenneth Leiter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ENH: Clean up some formatting and ignores to use the new function names.
parent
267b0f4a
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
43 additions
and
40 deletions
+43
-40
CMakeLists.txt
CMakeLists.txt
+7
-5
Xdmf.i
Xdmf.i
+2
-2
core/XdmfCore.i
core/XdmfCore.i
+5
-4
core/XdmfItem.hpp
core/XdmfItem.hpp
+1
-1
core/tests/Cxx/CMakeLists.txt
core/tests/Cxx/CMakeLists.txt
+3
-3
core/tests/Java/CMakeLists.txt
core/tests/Java/CMakeLists.txt
+6
-6
core/tests/Python/CMakeLists.txt
core/tests/Python/CMakeLists.txt
+4
-4
tests/Cxx/CMakeLists.txt
tests/Cxx/CMakeLists.txt
+5
-5
tests/Java/CMakeLists.txt
tests/Java/CMakeLists.txt
+8
-8
tests/Python/CMakeLists.txt
tests/Python/CMakeLists.txt
+2
-2
No files found.
CMakeLists.txt
View file @
f87db327
...
...
@@ -48,6 +48,7 @@ if(XDMF_WRAP_PYTHON)
# Target Name = the output target name will have ${python_name} as its name
MACRO
(
XDMF_SWIG_PYTHON python_name
)
set
(
CMAKE_SWIG_OUTDIR
${
CMAKE_BINARY_DIR
}
)
set
(
CMAKE_SWIG_FLAGS
""
)
set_source_files_properties
(
${
python_name
}
.i PROPERTIES CPLUSPLUS ON
)
swig_add_module
(
${
python_name
}
python
${
python_name
}
.i
)
swig_link_libraries
(
${
python_name
}
${
python_name
}
${
PYTHON_LIBRARIES
}
)
...
...
@@ -80,7 +81,7 @@ if(XDMF_WRAP_JAVA)
# Target Jar = the output target jar will have ${java_name}Java.jar as its name
MACRO
(
XDMF_SWIG_JAVA java_name
)
set
(
XDMF_JAVA_PACKAGE_DIR mil/army/arl/xdmf
)
set
(
XDMF_JAVA_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
XDMF_JAVA_PACKAGE_DIR
}
)
set
(
XDMF_JAVA_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
XDMF_JAVA_PACKAGE_DIR
}
)
set
(
CMAKE_SWIG_OUTDIR
${
XDMF_JAVA_DIR
}
)
set
(
CMAKE_SWIG_FLAGS -v -make_default -package mil.army.arl.xdmf
)
set_source_files_properties
(
${
java_name
}
.i PROPERTIES CPLUSPLUS ON
)
...
...
@@ -145,16 +146,17 @@ if(NOT XDMF_BUILD_CORE_ONLY)
add_library
(
Xdmf
${
XdmfSources
}
)
target_link_libraries
(
Xdmf XdmfCore
)
if
(
XDMF_WRAP_PYTHON
)
XDMF_SWIG_PYTHON
(
Xdmf XdmfCore
)
endif
(
XDMF_WRAP_PYTHON
)
if
(
XDMF_WRAP_JAVA
)
XDMF_SWIG_JAVA
(
Xdmf XdmfCoreJava
)
set
(
XDMF_JAVA_JAR
${
CMAKE_BINARY_DIR
}
/Xdmf.jar CACHE INTERNAL
""
)
endif
(
XDMF_WRAP_JAVA
)
if
(
XDMF_WRAP_PYTHON
)
XDMF_SWIG_PYTHON
(
Xdmf XdmfCore
)
endif
(
XDMF_WRAP_PYTHON
)
if
(
XDMF_BUILD_TESTING
)
include_directories
(
tests/Cxx
)
add_subdirectory
(
tests
)
endif
(
XDMF_BUILD_TESTING
)
...
...
Xdmf.i
View file @
f87db327
...
...
@@ -156,7 +156,6 @@ swig -v -c++ -python -o XdmfPython.cpp Xdmf.i
// we ask swig to ignore the static variable (thereby removing direct
// access to the variable, but leaving access to our getter function
%
ignore
XdmfAttribute
::
ItemTag
;
%
ignore
XdmfDomain
::
ItemTag
;
%
ignore
XdmfGeometry
::
ItemTag
;
...
...
@@ -183,6 +182,7 @@ swig -v -c++ -python -o XdmfPython.cpp Xdmf.i
%
ignore
XdmfGrid
::
getTime
()
const
;
%
ignore
XdmfGrid
::
getTopology
()
const
;
%
ignore
XdmfGridCollection
::
getGrid
(
const
unsigned
int
index
)
const
;
%
ignore
XdmfGridCollection
::
insert
(
const
boost
::
shared_ptr
<
XdmfInformation
>
information
)
;
%
ignore
XdmfGrid
::
getMap
()
const
;
%
ignore
XdmfSet
::
getHDF5Controller
()
const
;
...
...
@@ -203,7 +203,7 @@ swig -v -c++ -python -o XdmfPython.cpp Xdmf.i
}
%
}
#
endif
#
endif
*/
SWIGJAVA
*/
// Shared Pointer Templates
%
shared_ptr
(
XdmfAttribute
)
...
...
core/XdmfCore.i
View file @
f87db327
...
...
@@ -44,11 +44,12 @@ swig -v -c++ -python -o XdmfCorePython.cpp XdmfCore.i
%
template
()
Loki
::
Visitor
<
XdmfItem
>
;
#
ifdef
SWIGJAVA
%
ignore
XdmfArray
::
getHDF5Controller
()
const
;
%
ignore
XdmfArray
::
getValuesInternal
()
const
;
%
ignore
XdmfArray
::
ItemTag
;
%
ignore
XdmfInformation
::
ItemTag
;
%
ignore
XdmfDataItem
::
getArray
()
const
;
%
ignore
XdmfArray
::
getHDF5Controller
()
const
;
%
ignore
XdmfArray
::
getValuesPointer
()
const
;
%
ignore
XdmfItem
::
getInformation
(
const
unsigned
int
index
)
const
;
%
ignore
XdmfItem
::
getInformation
(
const
std
::
string
&
name
)
const
;
%
ignore
XdmfWriter
::
getHDF5Writer
()
const
;
%
pragma
(
java
)
jniclasscode
=%
{
...
...
@@ -61,7 +62,7 @@ swig -v -c++ -python -o XdmfCorePython.cpp XdmfCore.i
}
}
%
}
#
endif
#
endif
/* SWIGJAVA */
%
include
XdmfItem
.
hpp
%
include
XdmfItemProperty
.
hpp
...
...
core/XdmfItem.hpp
View file @
f87db327
...
...
@@ -53,7 +53,7 @@ public:
boost
::
shared_ptr
<
XdmfInformation
>
getInformation
(
const
std
::
string
&
key
);
/**
* Get an information attached to this grid by
name
(const version).
* Get an information attached to this grid by
key
(const version).
*
* @param key of the information to retrieve.
* @return requested information. If not found a NULL pointer is returned.
...
...
core/tests/Cxx/CMakeLists.txt
View file @
f87db327
...
...
@@ -9,7 +9,7 @@ include (UseCxxTest)
# Add any cxx tests here:
# Note: We don't want to use a foreach loop to test the files incase we
#
have extra arguments (ie: ADD_CXX_TEST(testname inputfile))
# have extra arguments (ie: ADD_CXX_TEST(testname inputfile))
# Read UseCxxTest.cmake for more information
# ---------------------------------------
ADD_CXX_TEST
(
TestXdmfArray
)
...
...
@@ -20,8 +20,8 @@ ADD_CXX_TEST(TestXdmfInformation)
# Add any cxx cleanup here:
# Note: We don't want to use a foreach loop to test the files incase we
#
have multiple files (ie: CLEAN_CXX_TEST(testname outputfile1 ...))
#
Read UseCxxTest.cmake for more information
#
have multiple files (ie: CLEAN_CXX_TEST(testname outputfile1 ...))
#
Read UseCxxTest.cmake for more information
# ---------------------------------------
CLEAN_CXX_TEST
(
TestXdmfArray
)
CLEAN_CXX_TEST
(
TestXdmfArrayWriteRead
...
...
core/tests/Java/CMakeLists.txt
View file @
f87db327
...
...
@@ -7,13 +7,13 @@ SET_PROPERTY(GLOBAL APPEND PROPERTY JAVA_TEST_DEPENDENCIES
# Note: JAVA_TEST_CLASSPATH is also set in core
GET_PROPERTY
(
java_classpath GLOBAL PROPERTY JAVA_TEST_CLASSPATH
)
SET_PROPERTY
(
GLOBAL PROPERTY JAVA_TEST_CLASSPATH
".:
${
XDMF_CORE_JAVA_JAR
}
"
".:
${
XDMF_CORE_JAVA_JAR
}
"
)
# Add any ldpath directories that the java tests may need
# Note: JAVA_TEST_LDPATH is also set in core
GET_PROPERTY
(
java_ldpath GLOBAL PROPERTY JAVA_TEST_LDPATH
)
SET_PROPERTY
(
GLOBAL PROPERTY JAVA_TEST_LDPATH
"
${
CMAKE_BINARY_DIR
}
"
"
${
CMAKE_BINARY_DIR
}
"
)
# Include our test macros
...
...
@@ -21,15 +21,15 @@ include (UseJavaTest)
# Add any java tests here:
# Note: We don't want to use a foreach loop to test the files incase we
#
have extra arguments (ie: ADD_JAVA_TEST(testname inputfile))
#
Read UseJavaTest.cmake for more information
#
have extra arguments (ie: ADD_JAVA_TEST(testname inputfile))
#
Read UseJavaTest.cmake for more information
# ------------------------
# none
# Add any java cleanup here:
# Note: We don't want to use a foreach loop to test the files incase we
#
have multiple files (ie: CLEAN_JAVA_TEST(testname outputfile1 ...))
#
Read UseCxxTest.cmake for more information
#
have multiple files (ie: CLEAN_JAVA_TEST(testname outputfile1 ...))
#
Read UseCxxTest.cmake for more information
# ---------------------------------------
# none
...
...
core/tests/Python/CMakeLists.txt
View file @
f87db327
# Add any dependencies that the python tests may need
# Note: The tests already depend on their own file
SET_PROPERTY
(
GLOBAL APPEND PROPERTY PYTHON_TEST_DEPENDENCIES
)
# Add any pythonpath directories that the python tests may need
...
...
@@ -22,8 +22,8 @@ ADD_PYTHON_TEST(TestXdmfArray)
# Add any python cleanup here:
# Note: We don't want to use a foreach loop to test the files incase we
#
have multiple files (ie: CLEAN_PYTHON_TEST(testname outputfile1 ...))
#
Read UseCxxTest.cmake for more information
#
have multiple files (ie: CLEAN_PYTHON_TEST(testname outputfile1 ...))
#
Read UseCxxTest.cmake for more information
# ---------------------------------------
CLEAN_PYTHON_TEST
(
TestXdmfArray
)
...
...
@@ -32,5 +32,5 @@ CLEAN_PYTHON_TEST(TestXdmfArray)
GET_PROPERTY
(
targets GLOBAL PROPERTY PYTHON_TEST_TARGETS
)
ADD_CUSTOM_TARGET
(
Python_Core_Test_target ALL DEPENDS
${
targets
}
)
# We need to reset the targe
s
ts since we created a core target
# We need to reset the targets since we created a core target
SET_PROPERTY
(
GLOBAL PROPERTY PYTHON_TEST_TARGETS
""
)
tests/Cxx/CMakeLists.txt
View file @
f87db327
# Add any dependencies that the cxx core tests may need
# Note: The tests already depend on their own file
SET_PROPERTY
(
GLOBAL APPEND PROPERTY CXX_TEST_DEPENDENCIES
"Xdmf"
"Xdmf"
)
# Include our test macros
...
...
@@ -9,8 +9,8 @@ include (UseCxxTest)
# Add any cxx tests here:
# Note: We don't want to use a foreach loop to test the files incase we
#
have extra arguments (id: ADD_CXX_TEST(testname inputfile))
#
Read UseCxxTest.cmake for more information
#
have extra arguments (id: ADD_CXX_TEST(testname inputfile))
#
Read UseCxxTest.cmake for more information
# ---------------------------------------
ADD_CXX_TEST
(
TestXdmfAttribute
)
ADD_CXX_TEST
(
TestXdmfGeometry
)
...
...
@@ -27,8 +27,8 @@ ADD_CXX_TEST(TestXdmfXPath)
# Add any cxx cleanup here:
# Note: We don't want to use a foreach loop to test the files incase we
#
have multiple files (ie: CLEAN_CXX_TEST(testname outputfile1 ...))
#
Read UseCxxTest.cmake for more information
#
have multiple files (ie: CLEAN_CXX_TEST(testname outputfile1 ...))
#
Read UseCxxTest.cmake for more information
# ---------------------------------------
CLEAN_CXX_TEST
(
TestXdmfAttribute
)
CLEAN_CXX_TEST
(
TestXdmfGeometry
)
...
...
tests/Java/CMakeLists.txt
View file @
f87db327
# Add any dependencies that the java tests may need
# Note: The tests already depend on their own file
#
JAVA_TEST_DEPENDENCIES is also set in core
#
JAVA_TEST_DEPENDENCIES is also set in core
SET_PROPERTY
(
GLOBAL APPEND PROPERTY JAVA_TEST_DEPENDENCIES
${
XDMF_JAVA_JAR
}
${
XDMF_JAVA_JAR
}
)
# Add any classpath directories that the java tests may need
# Note: JAVA_TEST_CLASSPATH is also set in core
GET_PROPERTY
(
java_classpath GLOBAL PROPERTY JAVA_TEST_CLASSPATH
)
SET_PROPERTY
(
GLOBAL PROPERTY JAVA_TEST_CLASSPATH
"
${
java_classpath
}
:
${
XDMF_JAVA_JAR
}
"
"
${
java_classpath
}
:
${
XDMF_JAVA_JAR
}
"
)
# Add any ldpath directories that the java tests may need
...
...
@@ -17,22 +17,22 @@ SET_PROPERTY(GLOBAL PROPERTY JAVA_TEST_CLASSPATH
GET_PROPERTY
(
java_ldpath GLOBAL PROPERTY JAVA_TEST_LDPATH
)
SET_PROPERTY
(
GLOBAL PROPERTY JAVA_TEST_LDPATH
"
${
java_ldpath
}
:"
)
)
# Include our test macros
include
(
UseJavaTest
)
# Add any java tests here:
# Note: We don't want to use a foreach loop to test the files incase we
#
have extra arguments (ie: ADD_JAVA_TEST(testname inputfile))
#
Read UseJavaTest.cmake for more information
# have extra arguments (ie: ADD_JAVA_TEST(testname inputfile))
# Read UseJavaTest.cmake for more information
# ------------------------
ADD_JAVA_TEST
(
TestXdmfJava
)
# Add any java cleanup here:
# Note: We don't want to use a foreach loop to test the files incase we
#
have multiple files (ie: CLEAN_JAVA_TEST(testname outputfile1 ...))
#
Read UseCxxTest.cmake for more information
#
have multiple files (ie: CLEAN_JAVA_TEST(testname outputfile1 ...))
#
Read UseCxxTest.cmake for more information
# ---------------------------------------
CLEAN_JAVA_TEST
(
TestXdmfJava
outputJavaTest.xmf
...
...
tests/Python/CMakeLists.txt
View file @
f87db327
...
...
@@ -25,8 +25,8 @@ ADD_PYTHON_TEST(TestXdmfWriter)
# Add any python cleanup here:
# Note: We don't want to use a foreach loop to test the files incase we
#
have multiple files (ie: CLEAN_PYTHON_TEST(testname outputfile1 ...))
#
Read UseCxxTest.cmake for more information
#
have multiple files (ie: CLEAN_PYTHON_TEST(testname outputfile1 ...))
#
Read UseCxxTest.cmake for more information
# ---------------------------------------
CLEAN_PYTHON_TEST
(
TestXdmfHDF5Writer
hdf5WriterPythonTest.h5
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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