Merge 10.2 into 10.3

4 files changed, 23 insertions, 27 deletions

diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
index 8657f6e22b3..f846684896d 100644
--- a/cmake/cpack_rpm.cmake
+++ b/cmake/cpack_rpm.cmake
@@ -45,17 +45,8 @@ SET(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
 SET(CPACK_RPM_PACKAGE_RELOCATABLE FALSE)
 SET(CPACK_PACKAGE_RELOCATABLE FALSE)
 SET(CPACK_RPM_PACKAGE_GROUP "Applications/Databases")
-SET(CPACK_RPM_PACKAGE_SUMMARY ${CPACK_PACKAGE_SUMMARY})
 SET(CPACK_RPM_PACKAGE_URL ${CPACK_PACKAGE_URL})
-SET(CPACK_RPM_PACKAGE_DESCRIPTION "${CPACK_RPM_PACKAGE_SUMMARY}
-
-It is GPL v2 licensed, which means you can use the it free of charge under the
-conditions of the GNU General Public License Version 2 (http://www.gnu.org/licenses/).
-
-MariaDB documentation can be found at https://mariadb.com/kb
-MariaDB bug reports should be submitted through https://jira.mariadb.org 
-
-")
+SET(CPACK_RPM_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION}")
 
 SET(CPACK_RPM_shared_PACKAGE_VENDOR "MariaDB Corporation Ab")
 SET(CPACK_RPM_shared_PACKAGE_LICENSE "LGPLv2.1")
diff --git a/cmake/misc.cmake b/cmake/misc.cmake
index 928c33fd8d2..2a0c57b1973 100644
--- a/cmake/misc.cmake
+++ b/cmake/misc.cmake
@@ -11,3 +11,9 @@ ELSE()
     SET(__msg1_${id} ${hash} CACHE INTERNAL "")
   ENDFUNCTION()
 ENDIF()
+
+MACRO(SET_IF_UNSET VAR VAL)
+  IF(NOT DEFINED ${VAR})
+    SET(${VAR} ${VAL})
+  ENDIF()
+ENDMACRO()
diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake
index ae4bb07b37b..85273136a32 100644
--- a/cmake/mysql_version.cmake
+++ b/cmake/mysql_version.cmake
@@ -75,24 +75,27 @@ string(TOUPPER ${SERVER_MATURITY} SERVER_MATURITY)
 SET(SERVER_MATURITY_LEVEL MariaDB_PLUGIN_MATURITY_${SERVER_MATURITY})
 
 SET(MYSQL_TCP_PORT_DEFAULT 0)
-IF(NOT MYSQL_TCP_PORT)
-  SET(MYSQL_TCP_PORT 3306)
-ENDIF()
+SET_IF_UNSET(MYSQL_TCP_PORT 3306)
 
-IF(NOT COMPILATION_COMMENT)
-  SET(COMPILATION_COMMENT "Source distribution")
-ENDIF()
+SET_IF_UNSET(COMPILATION_COMMENT "Source distribution")
 
 INCLUDE(package_name)
 IF(NOT CPACK_PACKAGE_FILE_NAME)
   GET_PACKAGE_FILE_NAME(CPACK_PACKAGE_FILE_NAME)
 ENDIF()
 
-IF(NOT CPACK_SOURCE_PACKAGE_FILE_NAME)
-  SET(CPACK_SOURCE_PACKAGE_FILE_NAME "mariadb-${VERSION}")
-ENDIF()
-SET(CPACK_PACKAGE_CONTACT "MariaDB Developers <maria-developers@lists.launchpad.net>")
-SET(CPACK_PACKAGE_VENDOR "MariaDB Foundation")
+SET_IF_UNSET(CPACK_SOURCE_PACKAGE_FILE_NAME "mariadb-${VERSION}")
+SET_IF_UNSET(CPACK_PACKAGE_CONTACT "MariaDB Developers <maria-developers@lists.launchpad.net>")
+SET_IF_UNSET(CPACK_PACKAGE_VENDOR "MariaDB Foundation")
+SET_IF_UNSET(CPACK_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}
+
+It is GPL v2 licensed, which means you can use the it free of charge under the
+conditions of the GNU General Public License Version 2 (http://www.gnu.org/licenses/).
+
+MariaDB documentation can be found at https://mariadb.com/kb
+MariaDB bug reports should be submitted through https://jira.mariadb.org
+
+")
 SET(CPACK_SOURCE_GENERATOR "TGZ")
 
 # Definitions for windows version resources
diff --git a/cmake/systemd.cmake b/cmake/systemd.cmake
index 8e3023bad6d..e353004e7d2 100644
--- a/cmake/systemd.cmake
+++ b/cmake/systemd.cmake
@@ -28,13 +28,9 @@ MACRO(CHECK_SYSTEMD)
           ENDIF()
         ENDIF()
         IF(HAVE_DLOPEN)
-          SET(LIBSYSTEMD ${LIBSYSTEMD_LIBRARIES})
-          #SET(CMAKE_REQUIRED_FLAGS ${LIBSYSTEMD_CFLAGS})
-          SET(MYSQLD_LINK_FLAGS "${MYSQLD_LINK_FLAGS} ${LIBSYSTEMD_LDFLAGS}")
+          SET(LIBSYSTEMD ${LIBSYSTEMD_LDFLAGS} ${LIBSYSTEMD_LIBRARIES})
         ELSE()
-          SET(LIBSYSTEMD ${LIBSYSTEMD_STATIC_LIBRARIES})
-          #SET(CMAKE_REQUIRED_FLAGS ${LIBSYSTEMD_STATIC_CFLAGS})
-          SET(MYSQLD_LINK_FLAGS "${MYSQLD_LINK_FLAGS} ${LIBSYSTEMD_STATIC_LDFLAGS}")
+          SET(LIBSYSTEMD ${LIBSYSTEMD_STATIC_LDFLAGS} ${LIBSYSTEMD_STATIC_LIBRARIES})
         ENDIF()
       ELSE()
         SET(LIBSYSTEMD systemd)