[GitHub] vongosling closed pull request #21: Support macOS Mojave 10.14.2

[GitBox <gi...@apache.org>]

vongosling closed pull request #21: Support macOS Mojave 10.14.2
URL: https://github.com/apache/rocketmq-client-python/pull/21
 
 
   

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/CMakeLists.txt b/CMakeLists.txt
index 12c0500..7df3c84 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,6 +70,7 @@ set(CXX_FLAGS
         -fPIC
         -fno-strict-aliasing
         -Wno-unused-result
+        -Wno-unused-local-typedef
         # -finline-limit=1000
         # -Wextra
         # -pedantic
diff --git a/project/CMakeLists.txt b/project/CMakeLists.txt
index c1b83f2..152c5e3 100644
--- a/project/CMakeLists.txt
+++ b/project/CMakeLists.txt
@@ -17,16 +17,16 @@
 
 project(rocketmqclientpython)
 
-file(GLOB_RECURSE SRC_FILES   ${CMAKE_SOURCE_DIR}/src/*)
+file(GLOB_RECURSE SRC_FILES ${CMAKE_SOURCE_DIR}/src/*)
 
 # subdirs
 SET(SUB_DIRS)
 file(GLOB children ${CMAKE_SOURCE_DIR}/src/*)
-FOREACH(child ${children})
-	IF(IS_DIRECTORY ${child})
-	    LIST(APPEND SUB_DIRS ${child})
-	ENDIF()
-ENDFOREACH()
+FOREACH (child ${children})
+    IF (IS_DIRECTORY ${child})
+        LIST(APPEND SUB_DIRS ${child})
+    ENDIF ()
+ENDFOREACH ()
 LIST(APPEND SUB_DIRS ${CMAKE_SOURCE_DIR}/src)
 
 # include_directories
@@ -43,15 +43,19 @@ set_target_properties(rocketmqclientpython_static PROPERTIES OUTPUT_NAME "rocket
 target_link_libraries(rocketmqclientpython_static ${deplibs})
 target_link_libraries(rocketmqclientpython_static ${ROCKETMQ_LIBRARIES})
 target_link_libraries(rocketmqclientpython_static ${Boost_LIBRARIES})
-
+target_link_libraries(rocketmqclientpython_static ${PYTHON_LIBRARIES})
 # shared
 set(CMAKE_SHARED_LINKER_FLAGS "-fPIC -shared")
 add_library(rocketmqclientpython_shared SHARED ${SRC_FILES})
 set_target_properties(rocketmqclientpython_shared PROPERTIES OUTPUT_NAME "rocketmqclientpython")
+if (APPLE)
+    set_target_properties(rocketmqclientpython_shared PROPERTIES SUFFIX .so)
+endif (APPLE)
 target_link_libraries(rocketmqclientpython_shared ${deplibs})
 target_link_libraries(rocketmqclientpython_shared ${ROCKETMQ_LIBRARIES})
 target_link_libraries(rocketmqclientpython_shared ${Boost_LIBRARIES})
+target_link_libraries(rocketmqclientpython_shared ${PYTHON_LIBRARIES})
 
 # install
-install (TARGETS   rocketmqclientpython_shared             DESTINATION lib)
+install(TARGETS rocketmqclientpython_shared DESTINATION lib)
 


 

----------------------------------------------------------------
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