MDEV-11195: Simplify enablement of NUMA in innodb/xtradb

Move common parts of {innodb,xtradb}/CmakeLists.txt to the macro.

cmake/numa.cmake

@@ -27,18 +27,16 @@ MACRO (MYSQL_CHECK_NUMA)
       SET(CMAKE_REQUIRED_LIBRARIES ${SAVE_CMAKE_REQUIRED_LIBRARIES})
       IF(HAVE_LIBNUMA)
         ADD_DEFINITIONS(-DHAVE_LIBNUMA=1)
+        SET(NUMA_LIBRARY "numa")
       ENDIF()
-    ELSE()
-      SET(HAVE_LIBNUMA 0)
     ENDIF()
 
     IF(WITH_NUMA AND NOT HAVE_LIBNUMA)
       # Forget it in cache, abort the build.
       UNSET(WITH_NUMA CACHE)
+      UNSET(NUMA_LIBRARY CACHE)
       MESSAGE(FATAL_ERROR "Could not find numa headers/libraries")
     ENDIF()
- ELSE()
-   SET(HAVE_LIBNUMA 0)
  ENDIF()
 
 ENDMACRO()

storage/innobase/CMakeLists.txt

@@ -175,11 +175,6 @@ IF(WITH_INNODB)
   SET(WITH_INNOBASE_STORAGE_ENGINE TRUE)
 ENDIF()
 
-UNSET(NUMA_LIBRARY)
-IF(HAVE_LIBNUMA)
-  SET(NUMA_LIBRARY "numa")
-ENDIF()
-
 MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOURCES} STORAGE_ENGINE
 #  MODULE_ONLY
 #  MODULE_OUTPUT_NAME ha_innodb

storage/xtradb/CMakeLists.txt

@@ -498,11 +498,6 @@ SET(INNOBASE_SOURCES
 	ut/ut0wqueue.cc
 	ut/ut0timer.cc)
 
-UNSET(NUMA_LIBRARY)
-IF(HAVE_LIBNUMA)
-  SET(NUMA_LIBRARY "numa")
-ENDIF()
-
 MYSQL_ADD_PLUGIN(xtradb ${INNOBASE_SOURCES} STORAGE_ENGINE
   DISABLED # until upgraded to 5.7, see also mysql-test/include/have_xtradb.combinations
   RECOMPILE_FOR_EMBEDDED