Skip to content

Commit

Permalink
Bug#23228287 LINKING ERROR ON OS X: XPLUGIN NEEDS UNBUILT LIBEVENT.A
Browse files Browse the repository at this point in the history
Move the flag EXCLUDE_FROM_ALL to the libevent target.
Remove the SHARED version of libevent, since it is not in use.

Change-Id: I5bd6466516a0e4ea5f711cad8c21348dc039a6db
(cherry picked from commit 1f27b6a6608bc8ac84074483013c2423dd3d9677)
  • Loading branch information
Tor Didriksen committed Dec 14, 2017
1 parent 2aec4eb commit 8ef61ba
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 1 addition & 3 deletions cmake/libevent.cmake
Expand Up @@ -19,9 +19,7 @@ MACRO (MYSQL_USE_BUNDLED_LIBEVENT)
SET(LIBEVENT_FOUND TRUE)
ADD_DEFINITIONS("-DHAVE_LIBEVENT1")
SET(WITH_LIBEVENT "bundled" CACHE STRING "Use bundled libevent")
# Use EXCLUDE_FROM_ALL to build only if another component
# which dependens on libevent is built
ADD_SUBDIRECTORY(libevent EXCLUDE_FROM_ALL)
ADD_SUBDIRECTORY(libevent)
GET_TARGET_PROPERTY(src libevent SOURCES)
FOREACH(file ${src})
SET(LIBEVENT_SOURCES ${LIBEVENT_SOURCES} ${CMAKE_SOURCE_DIR}/libevent/${file})
Expand Down
5 changes: 4 additions & 1 deletion libevent/CMakeLists.txt
Expand Up @@ -89,5 +89,8 @@ IF(MSVC)
ADD_COMPILE_FLAGS(${LIBEVENT_ALL_SRC} COMPILE_FLAGS "/wd4005 /wd4267 /wd4244")
ENDIF()

ADD_LIBRARY(event_share SHARED ${LIBEVENT_ALL_SRC})
ADD_LIBRARY(event STATIC ${LIBEVENT_ALL_SRC})

# Use EXCLUDE_FROM_ALL to build only if another component
# which dependens on libevent is built
SET_PROPERTY(TARGET event PROPERTY EXCLUDE_FROM_ALL TRUE)

0 comments on commit 8ef61ba

Please sign in to comment.