diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-06-14 18:06:06 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-06-14 18:06:06 +0000 |
| commit | 4df8c1519300b3d4589fda7c24455e2c87a9cf9c (patch) | |
| tree | f577a81759323e023dcd495849ed8860dfa3f0db /sci-chemistry/openbabel/files | |
| parent | Marked ~x86-macos (#369547) and ~ppc-macos (diff) | |
| download | historical-4df8c1519300b3d4589fda7c24455e2c87a9cf9c.tar.gz historical-4df8c1519300b3d4589fda7c24455e2c87a9cf9c.tar.bz2 historical-4df8c1519300b3d4589fda7c24455e2c87a9cf9c.zip | |
Fixed empty swig patch, thanks matts88
Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64
Diffstat (limited to 'sci-chemistry/openbabel/files')
| -rw-r--r-- | sci-chemistry/openbabel/files/openbabel-2.3.0-swig.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/sci-chemistry/openbabel/files/openbabel-2.3.0-swig.patch b/sci-chemistry/openbabel/files/openbabel-2.3.0-swig.patch index e69de29bb2d1..aeb29c5140fb 100644 --- a/sci-chemistry/openbabel/files/openbabel-2.3.0-swig.patch +++ b/sci-chemistry/openbabel/files/openbabel-2.3.0-swig.patch @@ -0,0 +1,42 @@ + scripts/CMakeLists.txt | 15 +++++---------- + 1 files changed, 5 insertions(+), 10 deletions(-) + +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +index bf2527b..df173f7 100644 +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -8,16 +8,11 @@ if (RUN_SWIG) + # SWIG_EXECUTABLE - the path to the swig executable + # SWIG_VERSION - the version number of the swig executable + +- find_package(SWIG) ++ find_package(SWIG 2.0) + if (NOT SWIG_FOUND) +- message(STATUS "SWIG NOT found") ++ message(STATUS "SWIG 2.0 NOT found") + return() + endif (NOT SWIG_FOUND) +- message(STATUS "SWIG version is ${SWIG_VERSION}") +- if (NOT ${SWIG_VERSION} STREQUAL "2.0.0" AND NOT ${SWIG_VERSION} STREQUAL "2.0.1") +- message(STATUS "SWIG version 2.0.0 exactly is required") +- return() +- endif (NOT ${SWIG_VERSION} STREQUAL "2.0.0" AND NOT ${SWIG_VERSION} STREQUAL "2.0.1") + endif (RUN_SWIG) + + ################### +@@ -84,12 +79,12 @@ if (DO_PYTHON_BINDINGS) + VERBATIM) + + if (PYTHON_PREFIX) +- install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${openbabel_SOURCE_DIR}/scripts/python/setup.py install --prefix=${PYTHON_PREFIX} WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts)") ++ install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${openbabel_SOURCE_DIR}/scripts/python/setup.py install --prefix=${PYTHON_PREFIX} WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts)" LIBRARY DESTINATION ${LIB_INSTALL_DIR}) + else (PYTHON_PREFIX) + if (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local") +- install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${openbabel_SOURCE_DIR}/scripts/python/setup.py install WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts)") ++ install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${openbabel_SOURCE_DIR}/scripts/python/setup.py install WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts)" LIBRARY DESTINATION ${LIB_INSTALL_DIR}) + else (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local") +- install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${openbabel_SOURCE_DIR}/scripts/python/setup.py install --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts)") ++ install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${openbabel_SOURCE_DIR}/scripts/python/setup.py install --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts)" LIBRARY DESTINATION ${LIB_INSTALL_DIR}) + endif (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local") + endif (PYTHON_PREFIX) + |