You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2018/12/13 22:09:08 UTC
[GitHub] merlimat closed pull request #3188: Allow the option to disable
Python wrapper compilation
merlimat closed pull request #3188: Allow the option to disable Python wrapper compilation
URL: https://github.com/apache/pulsar/pull/3188
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/pulsar-client-cpp/CMakeLists.txt b/pulsar-client-cpp/CMakeLists.txt
index 9de5245cdc..66b1fc965f 100644
--- a/pulsar-client-cpp/CMakeLists.txt
+++ b/pulsar-client-cpp/CMakeLists.txt
@@ -24,6 +24,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules")
option(BUILD_TESTS "Build tests" ON)
MESSAGE(STATUS "BUILD_TESTS: " ${BUILD_TESTS})
+option(BUILD_PYTHON_WRAPPER "Build Pulsar Python wrapper" ON)
+MESSAGE(STATUS "BUILD_PYTHON_WRAPPER: " ${BUILD_PYTHON_WRAPPER})
+
option(LINK_STATIC "Link against static libraries" OFF)
MESSAGE(STATUS "LINK_STATIC: " ${LINK_STATIC})
@@ -101,39 +104,39 @@ else()
endif (USE_LOG4CXX)
endif (LINK_STATIC)
-
-find_package(PythonLibs REQUIRED)
-
-
-MESSAGE(STATUS "PYTHON: " ${PYTHONLIBS_VERSION_STRING})
-
-if (PYTHONLIBS_VERSION_STRING MATCHES "^3.+$")
- MESSAGE(STATUS "DETECTED Python 3")
- string(REPLACE "." ";" PYTHONLIBS_VERSION_NO_LIST ${PYTHONLIBS_VERSION_STRING})
- list(GET PYTHONLIBS_VERSION_NO_LIST 0 PYTHONLIBS_VERSION_MAJOR)
- list(GET PYTHONLIBS_VERSION_NO_LIST 1 PYTHONLIBS_VERSION_MINOR)
- set(BOOST_PYTHON_NAME_POSTFIX ${PYTHONLIBS_VERSION_MAJOR}${PYTHONLIBS_VERSION_MINOR})
- # For python3 the lib name is boost_python3
- set(BOOST_PYTHON_NAME_LIST python3;python3-mt;python-py${BOOST_PYTHON_NAME_POSTFIX};python${BOOST_PYTHON_NAME_POSTFIX}-mt;python${BOOST_PYTHON_NAME_POSTFIX})
-else ()
- # Regular boost_python
- set(BOOST_PYTHON_NAME_LIST python;python-mt;python-py27;python27-mt;python27)
-endif ()
-
-foreach (BOOST_PYTHON_NAME IN LISTS BOOST_PYTHON_NAME_LIST)
- find_package(Boost QUIET COMPONENTS ${BOOST_PYTHON_NAME})
- if (${Boost_FOUND})
- set(BOOST_PYTHON_NAME_FOUND ${BOOST_PYTHON_NAME})
- break()
- endif()
-endforeach()
-
-if (NOT ${Boost_FOUND})
- MESSAGE(FATAL_ERROR "Could not find Boost Python library")
-endif ()
-
-find_package(Boost REQUIRED COMPONENTS program_options filesystem regex
- thread system ${BOOST_PYTHON_NAME_FOUND})
+find_package(Boost REQUIRED COMPONENTS program_options filesystem regex thread system)
+
+if (BUILD_PYTHON_WRAPPER)
+ find_package(PythonLibs REQUIRED)
+ MESSAGE(STATUS "PYTHON: " ${PYTHONLIBS_VERSION_STRING})
+
+ if (PYTHONLIBS_VERSION_STRING MATCHES "^3.+$")
+ MESSAGE(STATUS "DETECTED Python 3")
+ string(REPLACE "." ";" PYTHONLIBS_VERSION_NO_LIST ${PYTHONLIBS_VERSION_STRING})
+ list(GET PYTHONLIBS_VERSION_NO_LIST 0 PYTHONLIBS_VERSION_MAJOR)
+ list(GET PYTHONLIBS_VERSION_NO_LIST 1 PYTHONLIBS_VERSION_MINOR)
+ set(BOOST_PYTHON_NAME_POSTFIX ${PYTHONLIBS_VERSION_MAJOR}${PYTHONLIBS_VERSION_MINOR})
+ # For python3 the lib name is boost_python3
+ set(BOOST_PYTHON_NAME_LIST python3;python3-mt;python-py${BOOST_PYTHON_NAME_POSTFIX};python${BOOST_PYTHON_NAME_POSTFIX}-mt;python${BOOST_PYTHON_NAME_POSTFIX})
+ else ()
+ # Regular boost_python
+ set(BOOST_PYTHON_NAME_LIST python;python-mt;python-py27;python27-mt;python27)
+ endif ()
+
+ foreach (BOOST_PYTHON_NAME IN LISTS BOOST_PYTHON_NAME_LIST)
+ find_package(Boost QUIET COMPONENTS ${BOOST_PYTHON_NAME})
+ if (${Boost_FOUND})
+ set(BOOST_PYTHON_NAME_FOUND ${BOOST_PYTHON_NAME})
+ break()
+ endif()
+ endforeach()
+
+ if (NOT ${Boost_FOUND})
+ MESSAGE(FATAL_ERROR "Could not find Boost Python library")
+ endif ()
+
+ find_package(Boost REQUIRED COMPONENTS ${BOOST_PYTHON_NAME_FOUND})
+endif (BUILD_PYTHON_WRAPPER)
if (APPLE)
set(OPENSSL_INCLUDE_DIR /usr/local/opt/openssl/include/)
@@ -243,7 +246,9 @@ if (BUILD_TESTS)
add_subdirectory(tests)
endif()
-add_subdirectory(python)
+if (BUILD_PYTHON_WRAPPER)
+ add_subdirectory(python)
+endif ()
# `make format` option
if (NOT APPLE)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services