[incubator-pulsar] branch master updated: Enforce boost-python was found by CMake (#2608)

[mm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new d536d66  Enforce boost-python was found by CMake (#2608)
d536d66 is described below

commit d536d6669eb79c7b4235403c43ef5d6cf3b79dcd
Author: Matteo Merli <mm...@apache.org>
AuthorDate: Wed Sep 19 17:03:52 2018 -0700

    Enforce boost-python was found by CMake (#2608)
    
    * Enforce boost-python was found by CMake
    
    * Fix for linux build as well
---
 pulsar-client-cpp/docker/build-wheels.sh | 1 +
 pulsar-client-cpp/python/CMakeLists.txt  | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/pulsar-client-cpp/docker/build-wheels.sh b/pulsar-client-cpp/docker/build-wheels.sh
index ebbb441..3292519 100755
--- a/pulsar-client-cpp/docker/build-wheels.sh
+++ b/pulsar-client-cpp/docker/build-wheels.sh
@@ -33,6 +33,7 @@ PYTHON_VERSIONS=(
    '3.4 cp34-cp34m'
    '3.5 cp35-cp35m'
    '3.6 cp36-cp36m'
+   '3.7 cp37-cp37m'
 )
 
 function contains() {
diff --git a/pulsar-client-cpp/python/CMakeLists.txt b/pulsar-client-cpp/python/CMakeLists.txt
index 9ddbc01..2c51f6d 100644
--- a/pulsar-client-cpp/python/CMakeLists.txt
+++ b/pulsar-client-cpp/python/CMakeLists.txt
@@ -48,8 +48,17 @@ endif()
 set(PYTHON_WRAPPER_LIBS ${Boost_PYTHON_LIBRARY} ${Boost_PYTHON3_LIBRARY}
                         ${Boost_PYTHON27-MT_LIBRARY} ${Boost_PYTHON37-MT_LIBRARY})
 
+if (APPLE)
+    set(PYTHON_WRAPPER_LIBS ${PYTHON_WRAPPER_LIBS}
+                         ${Boost_PYTHON27-MT_LIBRARY_RELEASE} ${Boost_PYTHON37-MT_LIBRARY_RELEASE})
+endif()
+
 message(STATUS "Using Boost Python libs: ${PYTHON_WRAPPER_LIBS}")
 
+if (NOT PYTHON_WRAPPER_LIBS)
+    MESSAGE(FATAL_ERROR "Could not find Boost Python library")
+endif ()
+
 if (APPLE)
     target_link_libraries(_pulsar -Wl,-all_load pulsarStatic ${PYTHON_WRAPPER_LIBS})
 else ()