MDEV-16662 CMake warnings: CMP0022

CMakeLists.txt

@@ -14,12 +14,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
 
-# explicitly set the policy to OLD
-# (cannot use NEW, not everyone is on cmake-2.8.12 yet)
 IF(POLICY CMP0022)
-  CMAKE_POLICY(SET CMP0022 OLD)
+  CMAKE_POLICY(SET CMP0022 NEW)
 ENDIF()
 
 # We use the LOCATION target property (CMP0026)

cmake/libutils.cmake

@@ -269,7 +269,7 @@ MACRO(MERGE_LIBRARIES)
     IF (ARG_SOVERSION)
       SET_TARGET_PROPERTIES(${TARGET} PROPERTIES SOVERSION  ${ARG_VERSION})
     ENDIF()
-    TARGET_LINK_LIBRARIES(${TARGET} ${LIBS})
+    TARGET_LINK_LIBRARIES(${TARGET} LINK_PRIVATE ${LIBS})
     IF(ARG_OUTPUT_NAME)
       SET_TARGET_PROPERTIES(${TARGET} PROPERTIES OUTPUT_NAME "${ARG_OUTPUT_NAME}")
     ENDIF()
@@ -282,7 +282,6 @@ MACRO(MERGE_LIBRARIES)
     ENDIF()
     MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP})
   ENDIF()
-  SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_INTERFACE_LIBRARIES "")
   IF(ARG_SHARED AND LINK_FLAG_NO_UNDEFINED)
     # Do not allow undefined symbols in shared libraries
     GET_TARGET_PROPERTY(TARGET_LINK_FLAGS ${TARGET} LINK_FLAGS)

sql/CMakeLists.txt

@@ -307,8 +307,7 @@ TARGET_LINK_LIBRARIES(mysqld sql)
 # Provide plugins with minimal set of libraries
 SET(INTERFACE_LIBS ${LIBRT})
 IF(INTERFACE_LIBS)
- SET_TARGET_PROPERTIES(mysqld PROPERTIES LINK_INTERFACE_LIBRARIES 
-  "${INTERFACE_LIBS}")
+  TARGET_LINK_LIBRARIES(mysqld LINK_PUBLIC ${INTERFACE_LIBS})
 ENDIF()
 
 # On Solaris, some extra effort is required in order to get dtrace probes