Commit 59e15d5d authored by peastman's avatar peastman
Browse files

Merge pull request #390 from peastman/master

Install SWIG interface definition to the include directory, so outside plugins can use it when building their Python APIs
parents 6734f66d 598fdaa2
...@@ -106,7 +106,7 @@ mark_as_advanced(CLEAR DOXYGEN_EXECUTABLE) ...@@ -106,7 +106,7 @@ mark_as_advanced(CLEAR DOXYGEN_EXECUTABLE)
set(SWIG_OPENMM_DIR "${OPENMM_PYTHON_STAGING_DIR}/src/swig_doxygen") set(SWIG_OPENMM_DIR "${OPENMM_PYTHON_STAGING_DIR}/src/swig_doxygen")
file(MAKE_DIRECTORY ${SWIG_OPENMM_DIR}/swig_lib/python) file(MAKE_DIRECTORY ${SWIG_OPENMM_DIR}/swig_lib/python)
### Create OpenMM_headers.xml ### ### Create OpenMMSwigHeaders.i ###
# Step 1 - Create Doxyfile to point to OpenMM headers # Step 1 - Create Doxyfile to point to OpenMM headers
configure_file( configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/src/swig_doxygen/doxygen/Doxyfile.in ${CMAKE_CURRENT_SOURCE_DIR}/src/swig_doxygen/doxygen/Doxyfile.in
...@@ -130,7 +130,7 @@ set(SWIG_INPUT_FILES_REF ...@@ -130,7 +130,7 @@ set(SWIG_INPUT_FILES_REF
"${SWIG_OPENMM_DIR}/swig_lib/python/pythonprepend.i" "${SWIG_OPENMM_DIR}/swig_lib/python/pythonprepend.i"
"${SWIG_OPENMM_DIR}/swig_lib/python/pythonappend.i" "${SWIG_OPENMM_DIR}/swig_lib/python/pythonappend.i"
"${SWIG_OPENMM_DIR}/OpenMM_docstring.i" "${SWIG_OPENMM_DIR}/OpenMM_docstring.i"
"${SWIG_OPENMM_DIR}/OpenMM_headers.i" "${SWIG_OPENMM_DIR}/OpenMMSwigHeaders.i"
# "${SWIG_OPENMM_DIR}/OpenMM.i" # "${SWIG_OPENMM_DIR}/OpenMM.i"
) )
...@@ -153,7 +153,7 @@ add_custom_command( ...@@ -153,7 +153,7 @@ add_custom_command(
-i "${CMAKE_CURRENT_BINARY_DIR}/src/swig_doxygen/doxygen/xml" -i "${CMAKE_CURRENT_BINARY_DIR}/src/swig_doxygen/doxygen/xml"
-c swigInputConfig.py -c swigInputConfig.py
-d OpenMM_docstring.i -d OpenMM_docstring.i
-o OpenMM_headers.i -o OpenMMSwigHeaders.i
-a swig_lib/python/pythonprepend.i -a swig_lib/python/pythonprepend.i
-z swig_lib/python/pythonappend.i -z swig_lib/python/pythonappend.i
WORKING_DIRECTORY "${SWIG_OPENMM_DIR}" WORKING_DIRECTORY "${SWIG_OPENMM_DIR}"
...@@ -164,6 +164,8 @@ add_custom_command( ...@@ -164,6 +164,8 @@ add_custom_command(
COMMENT "Creating OpenMM Python swig input files..." COMMENT "Creating OpenMM Python swig input files..."
) )
INSTALL_FILES(/include FILES "${SWIG_OPENMM_DIR}/OpenMMSwigHeaders.i")
#~ swig -python -c++ \ #~ swig -python -c++ \
#~ -outdir $PYTHON_PACKAGE_DIR \ #~ -outdir $PYTHON_PACKAGE_DIR \
#~ -o OpenMMSwig.cxx \ #~ -o OpenMMSwig.cxx \
......
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