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
5eecc6c4
Commit
5eecc6c4
authored
Jan 27, 2011
by
Brian Panneton
Browse files
ENH: Removed test dependency for libraries in LD_PATH and PATH. Fixed Swig Parallel build issue.
parent
7239e256
Changes
5
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
5eecc6c4
...
...
@@ -58,6 +58,7 @@ if(XDMF_WRAP_PYTHON)
set
(
CMAKE_SWIG_OUTDIR
${
CMAKE_BINARY_DIR
}
)
set
(
CMAKE_SWIG_FLAGS
""
)
set_source_files_properties
(
${
python_name
}
.i PROPERTIES CPLUSPLUS ON
)
set
(
swig_extra_generated_files
""
)
swig_add_module
(
${
python_name
}
python
${
python_name
}
.i
)
swig_link_libraries
(
${
python_name
}
${
python_name
}
${
PYTHON_LIBRARIES
}
)
set_property
(
DIRECTORY APPEND PROPERTY
...
...
@@ -107,6 +108,7 @@ if(XDMF_WRAP_JAVA)
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
)
set
(
swig_extra_generated_files
""
)
swig_add_module
(
${
java_name
}
Java java
${
java_name
}
.i
)
swig_link_libraries
(
${
java_name
}
Java
${
java_name
}
)
...
...
core/CMakeLists.txt
View file @
5eecc6c4
...
...
@@ -29,6 +29,8 @@ if(HDF5_FOUND)
include_directories
(
${
MPI_INCLUDE_PATH
}
)
endif
(
MPI_FOUND
)
endif
(
HDF5_IS_PARALLEL
)
get_filename_component
(
HDF5_ROOT
"$HDF5_INCLUDE_DIR}/../"
REALPATH
)
set
(
HDF5_BINARY_DIRS
${
HDF5_ROOT
}
/bin
${
HDF5_ROOT
}
/dll
)
endif
(
HDF5_FOUND
)
if
(
XDMF_BUILD_DSM
)
...
...
@@ -49,6 +51,8 @@ endif(XDMF_BUILD_DSM)
find_package
(
LibXml2 REQUIRED
)
if
(
LIBXML2_FOUND
)
include_directories
(
${
LIBXML2_INCLUDE_DIR
}
)
get_filename_component
(
LIBXML2_ROOT
"
${
LIBXML2_INCLUDE_DIR
}
/../"
REALPATH
)
set
(
LIBXML2_BINARY_DIRS
${
LIBXML2_ROOT
}
/bin
)
endif
(
LIBXML2_FOUND
)
set
(
XdmfCoreSources
...
...
core/tests/Cxx/CMakeLists.txt
View file @
5eecc6c4
...
...
@@ -7,6 +7,13 @@ ADD_TEST_CXX_DEPENDENCIES("XdmfCore")
# Add any ldpath directories that the cxx tests may need
ADD_TEST_CXX_LDPATH
(
"
${
CMAKE_BINARY_DIR
}
"
)
ADD_TEST_CXX_LDPATH
(
"
${
HDF5_LIBRARIES
}
"
)
ADD_TEST_CXX_LDPATH
(
"
${
LIBXML2_LIBRARIES
}
"
)
# Add any path directoreis that the Cxx tests may need
ADD_TEST_CXX_PATH
(
"
${
CMAKE_BINARY_DIR
}
"
)
ADD_TEST_CXX_PATH
(
"
${
HDF5_BINARY_DIRS
}
"
)
ADD_TEST_CXX_PATH
(
"
${
LIBXML2_BINARY_DIRS
}
"
)
# Add any cxx tests here:
# Note: We don't want to use a foreach loop to test the files incase we
...
...
core/tests/Java/CMakeLists.txt
View file @
5eecc6c4
...
...
@@ -5,12 +5,17 @@ INCLUDE(AddTestsJava)
ADD_TEST_JAVA_DEPENDENCIES
(
Compiled_XdmfCore_Jar
)
# Add any classpath directories that the java tests may need
# Note: JAVA_TEST_CLASSPATH is also set in core
ADD_TEST_JAVA_CLASSPATH
(
"
${
XdmfCore_JAVA_JAR
}
"
)
# Add any ldpath directories that the java tests may need
# Note: JAVA_TEST_LDPATH is also set in core
ADD_TEST_JAVA_LDPATH
(
"
${
CMAKE_BINARY_DIR
}
"
)
ADD_TEST_JAVA_LDPATH
(
"
${
HDF5_LIBRARIES
}
"
)
ADD_TEST_JAVA_LDPATH
(
"
${
LIBXML2_LIBRARIES
}
"
)
# Add any path directories that the java tests may need
ADD_TEST_JAVA_PATH
(
"
${
CMAKE_BINARY_DIR
}
"
)
ADD_TEST_JAVA_PATH
(
"
${
HDF5_BINARY_DIRS
}
"
)
ADD_TEST_JAVA_PATH
(
"
${
LIBXML2_BINARY_DIRS
}
"
)
# Add any java tests here:
# Note: We don't want to use a foreach loop to test the files incase we
...
...
core/tests/Python/CMakeLists.txt
View file @
5eecc6c4
...
...
@@ -7,6 +7,16 @@ ADD_TEST_PYTHON_DEPENDENCIES("")
# Add any pythonpath directories that the python tests may need
ADD_TEST_PYTHON_PYTHONPATH
(
"
${
CMAKE_BINARY_DIR
}
"
)
# Add any ldpath directories that the python tests may need
ADD_TEST_PYTHON_LDPATH
(
"
${
CMAKE_BINARY_DIR
}
"
)
ADD_TEST_PYTHON_LDPATH
(
"
${
HDF5_LIBRARIES
}
"
)
ADD_TEST_PYTHON_LDPATH
(
"
${
LIBXML2_LIBRARIES
}
"
)
# Add any path directories that the python tests may need
ADD_TEST_PYTHON_PATH
(
"
${
CMAKE_BINARY_DIR
}
"
)
ADD_TEST_PYTHON_PATH
(
"
${
HDF5_BINARY_DIRS
}
"
)
ADD_TEST_PYTHON_PATH
(
"
${
LIBXML2_BINARY_DIRS
}
"
)
# Add any python tests here:
# Note: we don't want to use a foreach loop to test the files incase we
# have extra arguments (ie: ADD_TEST_PYTHON(testname inputfile))
...
...
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