Bug#20637746 ADD SUPPORT FOR PKG-CONFIG

Add mysqlclient.pc.in and INSTALL it if appropriate for the install layout.

Also: cleanup library settings in mysql_config (perl and sh variants).

Author: Tor Didriksen

scripts/CMakeLists.txt

@@ -202,6 +202,7 @@ SET(REPLACE_OPTIONS
   "-fno-inline "
   "-fno-strict-aliasing "
   "-fstack-protector-strong "
+  "-g "
   "-grecord-gcc-switches "
   "-ip "
   "-mp "
@@ -307,9 +308,8 @@ SET(pkglibdir ${prefix}/${INSTALL_LIBDIR})
 SET(pkgplugindir ${prefix}/${INSTALL_PLUGINDIR})
 SET(localstatedir ${MYSQL_DATADIR})
 
-SET(RPATH_OPTION "")
 IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
-  SET(RPATH_OPTION "-R$pkglibdir")
+  SET(RPATH_OPTION " -R$pkglibdir")
 ENDIF()
 
 # some scripts use  @TARGET_LINUX@
@@ -340,7 +340,6 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
     LIST(REMOVE_DUPLICATES ${target}_LIB_DEPENDS)
     FOREACH(lib ${${target}_LIB_DEPENDS})
       # Filter out "general", it is not a library, just CMake hint
-      # Also, remove duplicates
       IF(NOT lib STREQUAL "general" AND NOT ${var}  MATCHES "-l${lib} ")
         IF (lib MATCHES "^\\-l")
           SET(${var} "${${var}} ${lib} ") 
@@ -358,10 +357,36 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
   IF(MSVC)
     STRING(REPLACE "-l" "" ${var} "${${var}}")
   ENDIF()
+  STRING(REGEX REPLACE "^[ ]+" "" ${var} "${${var}}")
+  STRING(REGEX REPLACE "[ ]+$" "" ${var} "${${var}}")
 ENDMACRO()
 
 EXTRACT_LINK_LIBRARIES(mysqlclient CLIENT_LIBS)
-EXTRACT_LINK_LIBRARIES(mysqlserver LIBS)
+IF(WITH_EMBEDDED_SERVER)
+  EXTRACT_LINK_LIBRARIES(mysqlserver EMBEDD_LIBS)
+ENDIF()
+
+IF(MSVC)
+  GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION mysqlclient VERSION)
+  GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME mysqlclient OUTPUT_NAME)
+ELSE()
+  GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION libmysql VERSION)
+  GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME libmysql OUTPUT_NAME)
+ENDIF()
+# See WITH_EMBEDDED_SHARED_LIBRARY, "mysqld" is generated from mysqlserver
+IF(WITH_EMBEDDED_SERVER)
+  GET_TARGET_PROPERTY(LIBEMBED_OS_OUTPUT_NAME mysqlserver OUTPUT_NAME)
+ENDIF()
+
+SET(CONFIG_CLIENT_LIBS "${CLIENT_LIBS}")
+IF(QUOTED_CMAKE_C_LINK_FLAGS)
+  SET(CONFIG_CLIENT_LIBS "${CONFIG_CLIENT_LIBS} ${QUOTED_CMAKE_C_LINK_FLAGS}")
+ENDIF()
+
+SET(CONFIG_EMBEDD_LIBS "${EMBEDD_LIBS}")
+IF(QUOTED_CMAKE_CXX_LINK_FLAGS)
+  SET(CONFIG_EMBEDD_LIBS "${CONFIG_EMBEDD_LIBS} ${QUOTED_CMAKE_CXX_LINK_FLAGS}")
+ENDIF()
 
 SET(LIBMYSQLD_LIBS_USAGE "
         --libmysqld-libs [$embedded_libs]")
@@ -420,6 +445,30 @@ ELSE()
       )
   ENDIF()
 
+  SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc)
+  STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}")
+  SET(PKGCONFIG_DIR "${PKGCONFIG_DIR}/pkgconfig")
+  # Update the cache, to make it visible in cmake-gui.
+  SET(INSTALL_PKGCONFIGDIR ${INSTALL_PKGCONFIGDIR} CACHE PATH
+    "Where to install ${PKGCONFIG_FILE}, defaults to ${PKGCONFIG_DIR}")
+  IF(NOT INSTALL_PKGCONFIGDIR)
+    SET(INSTALL_PKGCONFIGDIR "${PKGCONFIG_DIR}")
+  ENDIF()
+
+  CONFIGURE_FILE(mysqlclient.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
+    ESCAPE_QUOTES @ONLY)
+
+  IF(INSTALL_PKGCONFIGDIR)
+    MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}")
+    INSTALL(FILES
+      ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
+      DESTINATION ${INSTALL_PKGCONFIGDIR}
+      PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+      COMPONENT Development
+      )
+  ENDIF()
+
   FOREACH(file ${BIN_SCRIPTS})
     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh

scripts/mysql_config.pl.in

@@ -166,71 +166,35 @@ if ( '@MYSQL_TCP_PORT_DEFAULT@' == 0 ) {
 
 # ----------------------------------------------------------------------
 # Create options 
-# We intentionally add a space to the beginning and end of lib strings, simplifies replace later
 # ----------------------------------------------------------------------
 
-my (@lib_opts,@lib_r_opts,@lib_e_opts);
+my(@lib_opts,@lib_e_opts);
 if ( $^O eq "MSWin32" )
 {
   my $linkpath   = "$pkglibdir";
-  # user32 is only needed for debug or embedded
-  my @winlibs = ("wsock32.lib","advapi32.lib","user32.lib");
-  @lib_opts   = ("$linkpath/mysqlclient.lib",@winlibs);
-  @lib_r_opts = @lib_opts;
-  @lib_e_opts = ("$linkpath/mysqlserver.lib",@winlibs);
+  @lib_opts   = ("$linkpath/@LIBMYSQL_OS_OUTPUT_NAME@");
+  @lib_e_opts = ("$linkpath/@LIBEMBED_OS_OUTPUT_NAME@");
 }
 else
 {
-  my $linkpath   = "-L$pkglibdir @RPATH_OPTION@";
-  @lib_opts   = ($linkpath,"-lmysqlclient");
-  @lib_r_opts = ($linkpath,"-lmysqlclient_r");
-  @lib_e_opts = ($linkpath,"-lmysqld");
+  my $linkpath   = "-L$pkglibdir@RPATH_OPTION@";
+  @lib_opts   = ($linkpath,"-l@LIBMYSQL_OS_OUTPUT_NAME@");
+  @lib_e_opts = ($linkpath,"-l@LIBEMBED_OS_OUTPUT_NAME@");
 }
 
+
 my $flags;
-$flags->{libs} =
-  [@ldflags,@lib_opts,'@ZLIB_DEPS@','@CLIENT_LIBS@','@openssl_libs@'];
-$flags->{libs_r} =
-  [@ldflags,@lib_r_opts,'@ZLIB_DEPS@','@CLIENT_LIBS@','@openssl_libs@'];
-$flags->{embedded_libs} =
-  [@ldflags,@lib_e_opts,'@ZLIB_DEPS@','@LIBS@','@WRAPLIBS@','@openssl_libs@'];
+$flags->{libs} = [@lib_opts, qw(@CONFIG_CLIENT_LIBS@)];
+$flags->{embedded_libs} = [@lib_e_opts, qw(@CONFIG_EMBEDD_LIBS@)];
 
 $flags->{include} = ["-I$pkgincludedir"];
 $flags->{cflags}  = [@{$flags->{include}},split(" ",'@CFLAGS@')];
 $flags->{cxxflags}= [@{$flags->{include}},split(" ",'@CXXFLAGS@')];
 
-# ----------------------------------------------------------------------
-# Remove some options that a client doesn't have to care about
-# ----------------------------------------------------------------------
-
-my @tmp = @{$flags->{cflags}};          # Copy the flag list
-$flags->{cflags} = [];                  # Clear it
-foreach my $cflag ( @tmp )
-{
-  push(@{$flags->{cflags}}, $cflag);
-}
-@tmp = @{$flags->{cxxflags}};           # Copy the flag list
-$flags->{cxxflags} = [];                # Clear it
-foreach my $cxxflag ( @tmp )
-{
-  push(@{$flags->{cxxflags}}, $cxxflag);
-}
-
-foreach my $lib_type ( "libs","libs_r","embedded_libs" )
-{
-  my @tmp = @{$flags->{$lib_type}};          # Copy the flag list
-  $flags->{$lib_type} = [];                  # Clear it
-  foreach my $lib ( @tmp )
-  {
-    push(@{$flags->{$lib_type}}, $lib);
-  }
-}
-
 my $include =       quote_options(@{$flags->{include}});
 my $cflags  =       quote_options(@{$flags->{cflags}});
 my $cxxflags=       quote_options(@{$flags->{cxxflags}});
 my $libs    =       quote_options(@{$flags->{libs}});
-my $libs_r  =       quote_options(@{$flags->{libs_r}});
 my $embedded_libs = quote_options(@{$flags->{embedded_libs}});
 
 ##############################################################################
@@ -248,7 +212,7 @@ Options:
         --cxxflags       [$cxxflags]
         --include        [$include]
         --libs           [$libs]
-        --libs_r         [$libs_r]
+        --libs_r         [$libs]
         --socket         [$socket]
         --port           [$port]
         --version        [$version]@LIBMYSQLD_LIBS_USAGE@
@@ -269,7 +233,7 @@ GetOptions(
            "cxxflags"=> sub { print "$cxxflags\n" },
            "include" => sub { print "$include\n" },
            "libs"    => sub { print "$libs\n" },
-           "libs_r"  => sub { print "$libs_r\n" },
+           "libs_r"  => sub { print "$libs\n" },
            "socket"  => sub { print "$socket\n" },
            "port"    => sub { print "$port\n" },
            "version" => sub { print "$version\n" },

scripts/mysql_config.sh

@@ -110,28 +110,15 @@ else
 fi
 
 # Create options 
-libs="$ldflags"
-libs="$libs -L$pkglibdir"
-libs="$libs @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @CLIENT_LIBS@"
-libs="$libs @openssl_libs@"
-libs="$libs @QUOTED_CMAKE_C_LINK_FLAGS@"
-
-libs_r="$libs"
-
-embedded_libs="$ldflags"
-embedded_libs="$embedded_libs -L$pkglibdir"
-embedded_libs="$embedded_libs @RPATH_OPTION@ -lmysqld @ZLIB_DEPS@ @LIBS@"
-embedded_libs="$embedded_libs @openssl_libs@"
-embedded_libs="$embedded_libs @QUOTED_CMAKE_CXX_LINK_FLAGS@"
+libs="-L$pkglibdir@RPATH_OPTION@"
+libs="$libs -l@LIBMYSQL_OS_OUTPUT_NAME@ @CONFIG_CLIENT_LIBS@"
+embedded_libs="-L$pkglibdir@RPATH_OPTION@"
+embedded_libs="$embedded_libs -l@LIBEMBED_OS_OUTPUT_NAME@ @CONFIG_EMBEDD_LIBS@"
 
 cflags="-I$pkgincludedir @CFLAGS@"
 cxxflags="-I$pkgincludedir @CXXFLAGS@"
 include="-I$pkgincludedir"
 
-# Strip whitespace
-libs=`echo "$libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
-libs_r=`echo "$libs_r" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
-embedded_libs=`echo "$embedded_libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
 
 usage () {
         cat <<EOF
@@ -141,7 +128,7 @@ Options:
         --cxxflags       [$cxxflags]
         --include        [$include]
         --libs           [$libs]
-        --libs_r         [$libs_r]
+        --libs_r         [$libs]
         --plugindir      [$plugindir]
         --socket         [$socket]
         --port           [$port]
@@ -162,7 +149,7 @@ while test $# -gt 0; do
         --cxxflags)echo "$cxxflags";;
         --include) echo "$include" ;;
         --libs)    echo "$libs" ;;
-        --libs_r)  echo "$libs_r" ;;
+        --libs_r)  echo "$libs" ;;
         --plugindir) echo "$plugindir" ;;
         --socket)  echo "$socket" ;;
         --port)    echo "$port" ;;

scripts/mysqlclient.pc.in

@@ -0,0 +1,12 @@
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+
+prefix=@CMAKE_INSTALL_PREFIX@
+includedir=${prefix}/@INSTALL_INCLUDEDIR@
+libdir=${prefix}/@INSTALL_LIBDIR@
+
+Name: @LIBMYSQL_OS_OUTPUT_NAME@
+Description: MySQL client library
+Version: @LIBMYSQL_OS_SHLIB_VERSION@
+Cflags: -I${includedir} @CFLAGS@
+Libs: -L${libdir} -l@LIBMYSQL_OS_OUTPUT_NAME@
+Libs.private: @CONFIG_CLIENT_LIBS@