Bug#25111489 GROUP REPLICATION BREAKS CMAKE --DFOO=SYSTEM BUILD

Tor Didriksen · Hery Ramilison · commit f1beb8bf3cdd · 2016-11-25T11:23:45.000+01:00
Change-Id: Ibaa0fad470ed3b1f5a89ea020cff2b38901568e1
Fix: include compile_flags.cmake
Also: fix broken unit test build for -DWITH_LIBEVENT=system
(cherry picked from commit 616c85f600817cc9073d85ea8db7077f5ec33b0d)
diff --git a/rapid/plugin/group_replication/CMakeLists.txt b/rapid/plugin/group_replication/CMakeLists.txt
@@ -16,6 +16,7 @@
 ### DEFINITIONS ###
 
 INCLUDE(configure.cmake)
+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
 
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_gcs.h.cmake
                ${CMAKE_CURRENT_BINARY_DIR}/include/mysql/gcs/mysql_gcs.h)
diff --git a/rapid/unittest/gunit/xplugin/CMakeLists.txt b/rapid/unittest/gunit/xplugin/CMakeLists.txt
@@ -138,7 +138,7 @@ TARGET_LINK_LIBRARIES(
   gmock
   mysqlservices
   mysqlclient
-  ${LIBEVENT_LIBRARY}
+  ${LIBEVENT_LIBRARY} ${LIBEVENT_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT}
   ${PROTOBUF_LIBRARY}
   ${GCOV_LDFLAGS}
