diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-06-16 09:27:12 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-06-16 09:27:12 +0000 |
| commit | 06f595c9bbe1f7fbc1d4e9dae7f5a0a384fe62c2 (patch) | |
| tree | 8288d5dff3be317d7ba8da017c4db1638238bc92 /src | |
| parent | 30b44fa282606a6a6b585e0e83b98dae4f2e6b2e (diff) | |
Fix CUSTOMBUILD : error : don't know how to set runtime library search path for MSVC
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/boost_system_no_deprecated_test@2549 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 94c7625b3bc8e943e3856e0e65dc65bb5d8cd0f7
Diffstat (limited to 'src')
| -rw-r--r-- | src/cython/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/cython/cythonize_gudhi.py.in | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt index 84441591..7586188c 100644 --- a/src/cython/CMakeLists.txt +++ b/src/cython/CMakeLists.txt @@ -170,6 +170,10 @@ if(CYTHON_FOUND) set(GUDHI_CYTHON_INCLUDE_DIRS "${GUDHI_CYTHON_INCLUDE_DIRS}'${TBB_INCLUDE_DIRS}', ") endif() + if(UNIX) + set( GUDHI_CYTHON_RUNTIME_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}") + endif(UNIX) + # set sphinx-build in make files configure_file(doc/Makefile.in "${CMAKE_CURRENT_BINARY_DIR}/doc/Makefile" @ONLY) configure_file(doc/make.bat.in "${CMAKE_CURRENT_BINARY_DIR}/doc/make.bat" @ONLY) @@ -187,10 +191,6 @@ if(CYTHON_FOUND) add_custom_target(cython ALL DEPENDS gudhi.so COMMENT "Do not forget to add ${CMAKE_CURRENT_BINARY_DIR}/ to your PYTHONPATH before using examples or tests") - if(UNIX) - set( ENV{PYTHONPATH} $ENV{PYTHONPATH}:${CMAKE_CURRENT_BINARY_DIR}/ ) - endif(UNIX) - # For installation purpose # TODO(VR) : files matching pattern mechanism is copying all cython directory install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" DESTINATION "${PYTHON_SITE_PACKAGES}/" FILES_MATCHING diff --git a/src/cython/cythonize_gudhi.py.in b/src/cython/cythonize_gudhi.py.in index 68a95916..c1a1717a 100644 --- a/src/cython/cythonize_gudhi.py.in +++ b/src/cython/cythonize_gudhi.py.in @@ -35,8 +35,8 @@ gudhi = Extension( extra_link_args=[@GUDHI_CYTHON_EXTRA_LINK_ARGS@], libraries=[@GUDHI_CYTHON_LIBRARIES@], library_dirs=[@GUDHI_CYTHON_LIBRARY_DIRS@], - runtime_library_dirs=[@GUDHI_CYTHON_LIBRARY_DIRS@], include_dirs = [@GUDHI_CYTHON_INCLUDE_DIRS@], + runtime_library_dirs=[@GUDHI_CYTHON_RUNTIME_LIBRARY_DIRS@], ) setup( |