Bug#22824957: MERGING OF INNODB AND KEYRING UNIT TESTS DOES NOT WORK PROPERLY

Merging of Innodb and Keyring unit tests did not work properly
because ADD_SUBDIRECTORY for these two directories was done
before the MERGE_UNITTESTS CMake option was declared.

This mean that on these unit tests were not merged properly on
the initial build. That meant individual build and linking for
each unit tests - which takes time and disk space.

This patch fixes the problem by moving ADD_SUBDIRECTORY
after MERGE_UNITTESTS has been defined.

Author: jhauglid

unittest/gunit/CMakeLists.txt

@@ -212,9 +212,6 @@ IF (WITH_SSL STREQUAL "bundled")
   ADD_SUBDIRECTORY(yassl)
 ENDIF()
 
-ADD_SUBDIRECTORY(innodb)
-ADD_SUBDIRECTORY(keyring) 
-
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/include
   ${CMAKE_SOURCE_DIR}/libbinlogevents/include
@@ -491,3 +488,6 @@ ENDIF(MERGE_UNITTESTS)
 
 ## Most executables depend on libeay32.dll (through mysys_ssl).
 COPY_OPENSSL_DLLS(copy_openssl_gunit)
+
+ADD_SUBDIRECTORY(innodb)
+ADD_SUBDIRECTORY(keyring)