Bug#22561096 UPGRADE TO CMAKE 3.2.3 BROKE NDBCLUSTER WINDOWS BUILD IN MYSQL-TRUNK

Bug#22572632 CMAKE WARNING IN NDB_CHECK_MYSQL_INCLUDE_FILE.CMAKE

Backport to 5.7

Author: Tor Didriksen

scripts/CMakeLists.txt

@@ -19,6 +19,9 @@ IF(NOT CMAKE_CROSSCOMPILING)
  TARGET_LINK_LIBRARIES(comp_sql)
 ENDIF()
 
+# Add compiler information, for easier debugging of output from mysql_config.
+SET(COMPILER_ID_AND_VERSION
+  "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
 
 # Build mysql_fix_privilege_tables.sql (concatenate 2 sql scripts)
 IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)

storage/ndb/cmake/ndb_check_mysql_include_file.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, 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 as published by
@@ -14,7 +14,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 MACRO(NDB_CHECK_MYSQL_INCLUDE_FILE INCLUDE VARIABLE)
-  IF("${VARIABLE}" MATCHES "^${VARIABLE}$")
+  IF("${${VARIABLE}}" MATCHES "^${${VARIABLE}}$")
     SET(_msg "Looking for MySQL include file ${INCLUDE}")
     MESSAGE(STATUS "${_msg}")
     IF(EXISTS "${CMAKE_SOURCE_DIR}/include/${INCLUDE}")

storage/ndb/cmake/ndb_require_variable.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2016, 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 as published by
@@ -20,8 +20,8 @@
 #
 MACRO(NDB_REQUIRE_VARIABLE variable_name)
   #MESSAGE(STATUS "Checking variable ${variable_name} required by NDB")
-  IF(NOT "${variable_name}")
+  IF("${${variable_name}}" STREQUAL "")
     MESSAGE(FATAL_ERROR "The variable ${variable_name} is required "
                          "to build NDB")
   ENDIF()
-ENDMACRO()
+ENDMACRO()