Fix for CONC-107, CONC-108 and CONC-109

Author: 9EOR9

CMakeLists.txt

@@ -5,7 +5,7 @@
 PROJECT(mariadb-client C)
 
 SET(CPACK_PACKAGE_VERSION_MAJOR 2)
-SET(CPACK_PACKAGE_VERSION_MINOR 0)
+SET(CPACK_PACKAGE_VERSION_MINOR 1)
 SET(CPACK_PACKAGE_VERSION_PATCH 0)
 SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 
@@ -97,15 +97,24 @@ SET(SHAREDIR "share")
 SET(DEFAULT_CHARSET_HOME "${CMAKE_INSTALL_PREFIX}")
 SET(PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/plugin")
 
-INCLUDE(cmake/SearchLibrary.cmake)
+INCLUDE(${CMAKE_SOURCE_DIR}/cmake/SearchLibrary.cmake)
+INCLUDE(CMakePackageConfigHelpers)
 
 IF(WITH_EXTERNAL_ZLIB)
   FIND_PACKAGE(ZLIB QUIET)
   IF(${ZLIB_FOUND})
-    SET(LIBZ "z")
+    SET(LIBZ "-lz")
   ENDIF()
 ENDIF()
 
+IF(NOT LIB_INSTALL_DIR)
+  SET(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib)
+ENDIF()
+
+IF(NOT INCLUDE_INSTALL_DIR)
+  SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include)
+ENDIF()
+ 
 IF(UNIX)
   SEARCH_LIBRARY(LIBNSL inet_ntoa "nsl_r;nsl")
   SEARCH_LIBRARY(LIBBIND bind "bind;socket")
@@ -161,7 +170,7 @@ IF(WITH_SQLITE)
 ENDIF()
 
 IF(NOT WIN32)
-  INCLUDE(cmake/FindIconv.cmake)
+  INCLUDE(${CMAKE_SOURCE_DIR}/cmake/FindIconv.cmake)
 ENDIF()
 
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/mysql_version.h.in

libmariadb/CMakeLists.txt

@@ -212,15 +212,15 @@ ENDIF()
 
 INSTALL(TARGETS
           libmariadb mariadbclient
-          RUNTIME DESTINATION "lib/mariadb"
-          LIBRARY DESTINATION "lib/mariadb"
-          ARCHIVE DESTINATION "lib/mariadb")
+          RUNTIME DESTINATION "${LIB_INSTALL_DIR}/mariadb"
+          LIBRARY DESTINATION "${LIB_INSTALL_DIR}/mariadb"
+          ARCHIVE DESTINATION "${LIB_INSTALL_DIR}/mariadb")
 IF(NOT WIN32 AND WITH_MYSQLCOMPAT)
   INSTALL(FILES "${CMAKE_BINARY_DIR}/libmariadb/libmysql${CMAKE_SHARED_LIBRARY_SUFFIX}"
                 "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX}"
                 "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX}"
                 "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX}"
-                DESTINATION lib/mariadb)
+                DESTINATION ${LIB_INSTALL_DIR}/mariadb)
 ENDIF()
 
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/

mariadb_config/mariadb_config.c.in

@@ -3,8 +3,8 @@
 #include <getopt.h>
 #include <stdio.h>
 
-#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/include/mariadb"
-#define LIBS    "-L@CMAKE_INSTALL_PREFIX@/lib/mariadb -lmariadb" \
+#define INCLUDE "-I@INCLUDE_INSTALL_DIR@/mariadb"
+#define LIBS    "-L@LIB_INSTALL_DIR@/mariadb -lmariadb" \
                 "@extra_dynamic_LDFLAGS@"
 #define CFLAGS  INCLUDE " @CMAKE_C_FLAGS@"
 #define VERSION "@MYSQL_CLIENT_VERSION@"