Bug#27505535 CANNOT USE -DWITH_ICU=SYSTEM IF -DWITH_LIBEVENT=SYSTEM I…

…S GIVEN Always INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) Change-Id: I15a7cad6631c4ead4647d32192960596adc831e1
sriduth · Mar 1, 2018 · 4ad13db · 4ad13db
1 parent 9dffe88
commit 4ad13db
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/extra/protobuf/CMakeLists.txt b/extra/protobuf/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -33,6 +33,8 @@
 #   protobuf-2.6.1/m4/
 #   protobuf-2.6.1/vsprojects/
 
+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
 SET(PROTOBUF_MSVC_DISABLED_WARNINGS "/wd4018 /wd4005 /wd4244 /wd4267 /wd4065")
 IF(WIN32_CLANG)
   SET(PROTOBUF_MSVC_DISABLED_WARNINGS "-Wno-sign-compare")

diff --git a/extra/re2/CMakeLists.txt b/extra/re2/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -22,6 +22,8 @@
 
 INCLUDE_DIRECTORIES(.)
 
+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
 SET(RE2_SOURCES
     util/arena.cc
     util/hash.cc