cmake: Add maintainer mode.

If MAINTAINER_MODE is enabled then:

1. New target 'connector-static' is added for building static connector library.
2. New build configuration 'Static' is defined that should be used for building 'connector-static' target.
3. If WITH_JDBC is enabled, both static and dynamic legacy libraries are built.

Author: rsomla1

CMakeLists.txt

@@ -272,7 +272,13 @@ option(BUILD_STATIC "Build static version of connector library" OFF)
 if(BUILD_STATIC)
   message("Building static connector library")
   set(LIB_TYPE STATIC)
-  add_definitions(-DCONCPP_BUILD_STATIC)
+
+  set_property(
+    DIRECTORY .
+    APPEND PROPERTY COMPILE_DEFINITIONS
+    $<$<NOT:$<CONFIG:Static>>:CONCPP_BUILD_STATIC>
+  )
+
 else()
   message("Building shared connector library")
 
@@ -281,7 +287,15 @@ else()
   endif()
 
   set(LIB_TYPE SHARED)
-  add_definitions(-DCONCPP_BUILD_SHARED)
+
+  set_property(
+    DIRECTORY .
+    APPEND PROPERTY COMPILE_DEFINITIONS
+    $<$<NOT:$<CONFIG:Static>>:CONCPP_BUILD_SHARED>
+  )
+
+  #TODO: do not set options below when building Static configuration?
+
   set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
   # Hide all symbols that are not explicitly exported.
@@ -296,6 +310,23 @@ else()
 
 endif()
 
+if(MAINTAINER_MODE)
+
+  list(APPEND CMAKE_CONFIGURATION_TYPES Static)
+
+  set(CMAKE_CXX_FLAGS_STATIC ${CMAKE_CXX_FLAGS_RELEASE})
+  set(CMAKE_C_FLAGS_STATIC ${CMAKE_C_FLAGS_RELEASE})
+  set(CMAKE_SHARED_LINKER_FLAGS_STATIC ${CMAKE_SHARED_LINKER_FLAGS_RELEASE})
+  set(CMAKE_EXE_LINKER_FLAGS_STATIC ${CMAKE_EXE_LINKER_FLAGS_RELEASE})
+
+  set_property(
+    DIRECTORY .
+    APPEND PROPERTY COMPILE_DEFINITIONS
+    $<$<CONFIG:Static>:CONCPP_BUILD_STATIC>
+  )
+
+endif()
+
 OPTION(WITH_TESTS "Build project's unit tests" 0)
 
 #
@@ -434,6 +465,19 @@ add_library_ex(connector ${LIB_TYPE}
 
 target_include_directories(connector PRIVATE "${WITH_UUID}/include")
 
+
+if(MAINTAINER_MODE)
+
+add_library_ex(connector-static STATIC EXCLUDE_FROM_ALL
+    ${WITH_UUID}/src/uuid_gen.cc
+    OBJECTS xapi devapi common
+    LIBS    cdk
+)
+
+target_include_directories(connector-static PRIVATE "${WITH_UUID}/include")
+
+endif()
+
 # Disable warnings in code which is not ours.
 
 if(MSVC)
@@ -495,12 +539,14 @@ endif()
 # static runtime.
 #
 
+set(LIB_NAME_STATIC "${LIB_NAME_BASE}-static")
+if(WIN32 AND STATIC_MSVCRT)
+  set(LIB_NAME_STATIC "${LIB_NAME}-mt")
+endif()
+
 if(BUILD_STATIC)
 
-  set(LIB_NAME "${LIB_NAME_BASE}-static")
-  if(WIN32 AND STATIC_MSVCRT)
-    set(LIB_NAME "${LIB_NAME}-mt")
-  endif()
+  set(LIB_NAME ${LIB_NAME_STATIC})
 
 else()
 
@@ -542,21 +588,45 @@ install(TARGETS connector
   LIBRARY DESTINATION "${INSTALL_LIB_DIR}/debug"
 )
 
+if(MAINTAINER_MODE)
+
+  set_property(TARGET connector-static PROPERTY OUTPUT_NAME ${LIB_NAME_STATIC})
+
+  set_target_properties(connector-static PROPERTIES
+    VERSION "${ABI_VERSION_MAJOR}.${CONCPP_VERSION}"
+    SOVERSION "${ABI_VERSION_MAJOR}"
+  )
+
+  install(TARGETS connector-static
+    CONFIGURATIONS Static
+    ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}"
+    RUNTIME DESTINATION "${INSTALL_LIB_DIR}"
+    LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
+  )
+
+endif()
 
 #
 # Tests
 # =====
 #
 
-remove_definitions(-DCONCPP_BUILD_STATIC)
-remove_definitions(-DCONCPP_BUILD_SHARED)
+#
+# Note: We must clear compile flags - the ones used to build the connector
+# are not good for building client code that uses the connector.
+#
+
+set_property(
+  DIRECTORY .
+  PROPERTY COMPILE_DEFINITIONS ""
+)
 
 if(BUILD_STATIC)
   add_definitions(-DSTATIC_CONCPP)
 endif()
 
-# Auto-generated test targets
 
+# Auto-generated test targets
 
 IF (WITH_TESTS)
   # Unit tests declared with ADD_NG_TEST() (see cdk/cmake/testing.cmake)

devapi/tests/CMakeLists.txt

@@ -27,12 +27,14 @@
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 #
-# Undefine macros which indicate building of the connector library
-# (as opposed to using it from test code). This is used by public headers.
+# Note: We must clear compile flags - the ones used to build the connector
+# are not good for building client code that uses the connector.
 #
 
-remove_definitions(-DCONCPP_BUILD_STATIC)
-remove_definitions(-DCONCPP_BUILD_SHARED)
+set_property(
+  DIRECTORY .
+  PROPERTY COMPILE_DEFINITIONS ""
+)
 
 if(WIN32)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)

jdbc.cmake

@@ -20,22 +20,30 @@ file(MAKE_DIRECTORY "${JDBC_DIR}")
 # Configure legacy connector build environment in ${JDBC_DIR}
 #
 
-list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=ON)
-
-if(CMAKE_BUILD_TYPE)
-  list(APPEND jdbc_cmake_opts -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
-endif()
-
 if(BUILD_STATIC)
   list(APPEND jdbc_cmake_opts -DENABLE_BUILD_STATIC=ON)
 else()
   list(APPEND jdbc_cmake_opts -DENABLE_BUILD_DYNAMIC=ON)
 endif()
 
+if(MAINTAINER_MODE)
+  list(APPEND jdbc_cmake_opts -DENABLE_BUILD_STATIC=ON)
+endif()
+
 if(MYSQL_DIR)
   list(APPEND jdbc_cmake_opts -DMYSQL_DIR=${MYSQL_DIR})
 endif()
 
+list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=ON)
+
+if(CMAKE_BUILD_TYPE)
+  if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]")
+    list(APPEND jdbc_cmake_opts -DCMAKE_BUILD_TYPE=Release)
+  else()
+    list(APPEND jdbc_cmake_opts -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
+  endif()
+endif()
+
 if(DEFINED STATIC_MSVCRT)
   list(APPEND jdbc_cmake_opts -DSTATIC_MSVCRT=${STATIC_MSVCRT})
 endif()
@@ -102,11 +110,15 @@ set(JDBC_BUILD_STAMP "${PROJECT_BINARY_DIR}/jdbc.buildstamp")
 file(REMOVE "${JDBC_BUILD_STAMP}")
 #message("JDBC_BUILD_STAMP: ${JDBC_BUILD_STAMP}")
 
+set(CONFIG_EXPR
+  $<$<CONFIG:Static>:Release>$<$<NOT:$<CONFIG:Static>>:$<CONFIGURATION>>
+)
+
 add_custom_command(OUTPUT ${JDBC_BUILD_STAMP}
 
   COMMAND ${CMAKE_COMMAND} -E remove_directory install
   COMMAND ${CMAKE_COMMAND}
-    --build . --target install --config $<CONFIGURATION> --clean-first
+    --build . --target install --config ${CONFIG_EXPR} --clean-first
 
   # Move installed headers from include/ to include/jdbc and rename lib/
   # to lib64/ for 64-bit platform
@@ -120,7 +132,7 @@ add_custom_command(OUTPUT ${JDBC_BUILD_STAMP}
   COMMAND ${CMAKE_COMMAND} -E touch ${JDBC_BUILD_STAMP}
 
   WORKING_DIRECTORY ${JDBC_DIR}
-  COMMENT "Building legacy connector library using configuration: $<CONFIGURATION>"
+  COMMENT "Building legacy connector library using configuration: $(Configuration)"
 )
 
 # Collect sources of legacy connector and specify them in the build
@@ -261,6 +273,26 @@ install(
   DESTINATION ${INSTALL_INCLUDE_DIR}
 )
 
+#
+# In maintainer mode add specifications for installing the static library
+# which is always built in this mode.
+#
+
+if(MAINTAINER_MODE)
+
+  add_dependencies(mysqlcppconn-static build_jdbc)
+  get_target_property(location mysqlcppconn-static IMPORTED_LOCATION_RELEASE)
+  message("jdbc installing: ${location} (MAINTAINER_MODE)")
+
+  install(
+    FILES ${location}
+    CONFIGURATIONS Static
+    DESTINATION "${INSTALL_LIB_DIR_STATIC}"
+    COMPONENT JDBCDev
+  )
+
+endif()
+
 
 #
 #  Install external dependencies of MySQL client library, such as OpenSSL,

xapi/tests/CMakeLists.txt

@@ -26,8 +26,16 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-remove_definitions(-DCONCPP_BUILD_STATIC)
-remove_definitions(-DCONCPP_BUILD_SHARED)
+#
+# Note: We must clear compile flags - the ones used to build the connector
+# are not good for building client code that uses the connector.
+#
+
+set_property(
+  DIRECTORY .
+  PROPERTY COMPILE_DEFINITIONS ""
+)
+
 if(BUILD_STATIC)
   add_definitions(-DSTATIC_CONCPP)
 endif()