diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-08-12 15:13:31 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-08-12 15:13:31 +0000 |
| commit | 46566db4452be7dee8398e1ed5a25add7f80ac39 (patch) | |
| tree | 9930d30af1dd10ce4d68f0babd7926ccc6a1e078 /src | |
| parent | 15dcd7e8991e6fa3803c601b2644e12b0ca4be5a (diff) | |
move cython/src/cpp into cython/src/include
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@1435 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 1e437925f01965216b672376c1bba7709b78c8b0
Diffstat (limited to 'src')
| -rw-r--r-- | src/cython/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/cython/src/include/Alpha_complex_interface.h (renamed from src/cython/src/cpp/Alpha_complex_interface.h) | 0 | ||||
| -rw-r--r-- | src/cython/src/include/Cubical_complex_interface.h (renamed from src/cython/src/cpp/Cubical_complex_interface.h) | 0 | ||||
| -rw-r--r-- | src/cython/src/include/Persistent_cohomology_interface.h (renamed from src/cython/src/cpp/Persistent_cohomology_interface.h) | 0 | ||||
| -rw-r--r-- | src/cython/src/include/Simplex_tree_interface.h (renamed from src/cython/src/cpp/Simplex_tree_interface.h) | 0 | ||||
| -rw-r--r-- | src/cython/src/include/Witness_complex_interface.h (renamed from src/cython/src/cpp/Witness_complex_interface.h) | 0 |
6 files changed, 2 insertions, 2 deletions
diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt index 8012b592..bb90ad5b 100644 --- a/src/cython/CMakeLists.txt +++ b/src/cython/CMakeLists.txt @@ -60,7 +60,7 @@ if(PYTHON_PATH AND CYTHON_PATH) foreach(GUDHI_INCLUDE_DIRECTORY ${GUDHI_INCLUDE_DIRECTORIES}) set(GUDHI_CYTHON_INCLUDE_DIRS "${GUDHI_CYTHON_INCLUDE_DIRS}'${GUDHI_INCLUDE_DIRECTORY}', ") endforeach() - set(GUDHI_CYTHON_INCLUDE_DIRS "${GUDHI_CYTHON_INCLUDE_DIRS}'${CMAKE_SOURCE_DIR}/${GUDHI_CYTHON_PATH}/src/cpp', ") + set(GUDHI_CYTHON_INCLUDE_DIRS "${GUDHI_CYTHON_INCLUDE_DIRS}'${CMAKE_SOURCE_DIR}/${GUDHI_CYTHON_PATH}/src/include', ") # Generate cythonize_gudhi.py file to cythonize Gudhi configure_file(cythonize_gudhi.py.in "${CMAKE_CURRENT_BINARY_DIR}/cythonize_gudhi.py" @ONLY) @@ -88,7 +88,7 @@ if(PYTHON_PATH AND CYTHON_PATH) # Documentation generation is available through sphinx find_program( SPHINX_PATH sphinx-build ) if(SPHINX_PATH) - file(COPY doc DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) + file(COPY src/doc DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) # Developper version file(GLOB GUDHI_DEV_DOC_IMAGES "${CMAKE_SOURCE_DIR}/src/*/doc/*.png") file(COPY ${GUDHI_DEV_DOC_IMAGES} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/src/doc/img") diff --git a/src/cython/src/cpp/Alpha_complex_interface.h b/src/cython/src/include/Alpha_complex_interface.h index e2e6d100..e2e6d100 100644 --- a/src/cython/src/cpp/Alpha_complex_interface.h +++ b/src/cython/src/include/Alpha_complex_interface.h diff --git a/src/cython/src/cpp/Cubical_complex_interface.h b/src/cython/src/include/Cubical_complex_interface.h index 5d17ff6b..5d17ff6b 100644 --- a/src/cython/src/cpp/Cubical_complex_interface.h +++ b/src/cython/src/include/Cubical_complex_interface.h diff --git a/src/cython/src/cpp/Persistent_cohomology_interface.h b/src/cython/src/include/Persistent_cohomology_interface.h index 58421799..58421799 100644 --- a/src/cython/src/cpp/Persistent_cohomology_interface.h +++ b/src/cython/src/include/Persistent_cohomology_interface.h diff --git a/src/cython/src/cpp/Simplex_tree_interface.h b/src/cython/src/include/Simplex_tree_interface.h index 9aee630b..9aee630b 100644 --- a/src/cython/src/cpp/Simplex_tree_interface.h +++ b/src/cython/src/include/Simplex_tree_interface.h diff --git a/src/cython/src/cpp/Witness_complex_interface.h b/src/cython/src/include/Witness_complex_interface.h index bdfea91f..bdfea91f 100644 --- a/src/cython/src/cpp/Witness_complex_interface.h +++ b/src/cython/src/include/Witness_complex_interface.h |