Merge remote-tracking branch 'origin/wl10893'

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)
 
 #
@@ -418,6 +449,10 @@ ADD_SUBDIRECTORY(common)
 ADD_SUBDIRECTORY(xapi)
 ADD_SUBDIRECTORY(devapi)
 
+#
+# Packaging
+#
+ADD_SUBDIRECTORY(packaging)
 
 #
 #  Target which builds the final connector library
@@ -434,6 +469,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 +543,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()
 
@@ -530,33 +580,57 @@ set_target_properties(connector PROPERTIES
 
 install(TARGETS connector
   CONFIGURATIONS Release RelWithDebInfo
-  ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}"
-  RUNTIME DESTINATION "${INSTALL_LIB_DIR}"
-  LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
+  ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT XDevAPIDev
+  RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll
+  LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll
 )
 
 install(TARGETS connector
   CONFIGURATIONS Debug
-  ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}/debug"
-  RUNTIME DESTINATION "${INSTALL_LIB_DIR}/debug"
-  LIBRARY DESTINATION "${INSTALL_LIB_DIR}/debug"
+  ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}/debug" COMPONENT XDevAPIDev
+  RUNTIME DESTINATION "${INSTALL_LIB_DIR}/debug" COMPONENT XDevAPIDll
+  LIBRARY DESTINATION "${INSTALL_LIB_DIR}/debug" COMPONENT XDevAPIDll
 )
 
+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}" COMPONENT XDevAPIDev
+    RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll
+    LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll
+  )
+
+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)
@@ -571,14 +645,14 @@ ENDIF (WITH_TESTS)
 # Sample code to try things out
 #
 
-ADD_EXECUTABLE(try try.cc)
+ADD_EXECUTABLE(try EXCLUDE_FROM_ALL try.cc)
 TARGET_LINK_LIBRARIES(try connector)
 SET_INTERFACE_OPTIONS(try devapi)
 #  ADD_GCOV(try)
 
 if(WITH_JDBC)
 
-  add_executable(try_jdbc try_jdbc.cc)
+  add_executable(try_jdbc EXCLUDE_FROM_ALL try_jdbc.cc)
   target_link_libraries(try_jdbc ${JDBC_LIBS})
   add_dependencies(try_jdbc build_jdbc)
   target_include_directories(try_jdbc PRIVATE ${JDBC_INCLUDES})
@@ -695,5 +769,6 @@ message("Connector libraries will be installed at: ${INSTALL_LIB_DIR}")
 option(WITH_PACKAGES "Configure for building binary/source packages" OFF)
 if(WITH_PACKAGES)
   include(PackageSpecs.cmake)
+  ADD_SUBDIRECTORY(packaging/WiX)
 endif()
 

PackageSpecs.cmake

@@ -148,7 +148,7 @@ foreach(file ${info_files})
   set(file_bin "${CMAKE_BINARY_DIR}/${file}${info_ext}")
 
   configure_file("${file_src}" "${file_bin}" NEWLINE_STYLE ${newline})
-  install(FILES "${file_bin}" DESTINATION .)
+  install(FILES "${file_bin}" DESTINATION . COMPONENT Readme)
 
 endforeach()
 

buildinfo.cmake

@@ -112,4 +112,4 @@ if(WITH_JDBC)
 endif()
 
 
-install(FILES "${PROJECT_BINARY_DIR}/BUILDINFO.txt" DESTINATION .)
+install(FILES "${PROJECT_BINARY_DIR}/BUILDINFO.txt" DESTINATION . COMPONENT Readme)

cdk/cmake/libutils.cmake

@@ -133,6 +133,13 @@ function(add_library_ex TARGET)
     list(REMOVE_AT ARGN 0)
   endif()
 
+  unset(exclude)
+  if(arg STREQUAL "EXCLUDE_FROM_ALL")
+    set(exclude "EXCLUDE_FROM_ALL")
+    list(GET ARGN 0 arg)
+    list(REMOVE_AT ARGN 0)
+  endif()
+
   #
   #  Collect library sources, up to first OBJECTS or LIBS word
   #
@@ -243,7 +250,7 @@ function(add_library_ex TARGET)
     endforeach()
   endif()
 
-  add_library(${TARGET} ${type} ${srcs})
+  add_library(${TARGET} ${type} ${exclude} ${srcs})
   #message("- added ${type} library: ${TARGET}")
 
   if(mangle_paths)

cdk/cmake/protobuf.cmake

@@ -44,12 +44,32 @@ message("Configuring Protobuf build using cmake generator: ${CMAKE_GENERATOR}")
 file(REMOVE ${PROJECT_BINARY_DIR}/protobuf/CMakeCache.txt)
 file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/protobuf)
 
-# If specified, use the same build type for Protobuf
+#
+# Pick build configuration for the protobuf build. Normally we build using the
+# same build configuration that is used for building CDK (Release/Debug/etc.).
+# But we also support building CDK under non-standard build configuration
+# named 'Static' (this is a dirty trick we use to simplify building our MSIs).
+# Since protobuf does not know 'Static' build configuration, we build protobuf
+# under 'Release' configuration in that case.
+#
+# We need to handle two cases. For some build systems, like Makefiles, the build
+# configuration is specified at cmake time using CMAKE_BUILD_TYPE variable. In
+# that case we also set it during protobuf build configuration. Another case is
+# a multi-configuration build system like MSVC. In this case we use generator
+# expression to pick correct  configuration when the build command is invoked
+# below.
+#
 
 if(CMAKE_BUILD_TYPE)
-  set(set_build_type -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
+  if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]")
+    set(set_build_type -DCMAKE_BUILD_TYPE=Release)
+  else()
+    set(set_build_type -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
+  endif()
 endif()
 
+set(CONFIG_EXPR $<$<CONFIG:Static>:Release>$<$<NOT:$<CONFIG:Static>>:$<CONFIG>>)
+
 execute_process(
   COMMAND ${CMAKE_COMMAND}
           -G "${CMAKE_GENERATOR}"
@@ -76,8 +96,11 @@ include(${PROJECT_BINARY_DIR}/protobuf/exports.cmake)
 # a sub-project of a parent project, because the parent project
 # must have access to these targets.
 #
-# For that reason blow we create global protobuf/protobuf-lite targets
-# and copy their loactions from the imported targets.
+# For that reason below we create global protobuf/protobuf-lite targets
+# and copy their locations from the imported targets.
+#
+# Note: we can't use ALIAS library because it does not work with imported
+# targets
 #
 
 add_library(protobuf STATIC IMPORTED GLOBAL)
@@ -91,40 +114,32 @@ foreach(lib protobuf protobuf-lite)
 
     get_target_property(LOC pb_${lib} IMPORTED_LOCATION_${CONF})
     if(LOC)
-      #message("- settig imported location to: ${LOC}")
-      set(location "${LOC}")
+      #message("- setting imported location to: ${LOC}")
       set_target_properties(${lib} PROPERTIES
         IMPORTED_LOCATION_${CONF} "${LOC}"
       )
       set_property(TARGET ${lib} APPEND PROPERTY
-        IMPORTED_CONFIGURATIONS ${CONF})
+        IMPORTED_CONFIGURATIONS ${CONF}
+      )
     endif()
 
   endforeach(CONF)
 
-  # For multi-configuration builders like MSVC, set a generic
-  # location of the form <prefix>/$(Configuration)/<name> which will
-  # work with any configuration choosen at build time.
-  # It is constructed from one of per-configurartion locations
-  # determined above and saved in ${location}. The logic assumes
-  # that the per-configration location is of the form
-  # <prefix>/<config>/<name>
-
-  if(CMAKE_CONFIGURATION_TYPES)
+endforeach(lib)
 
-    get_filename_component(name "${location}" NAME)
-    get_filename_component(LOC "${location}" PATH)
-    get_filename_component(LOC "${LOC}" PATH)
-    set(LOC "${LOC}/$(Configuration)/${name}")
+#
+# To support 'Static' build configuration the targets imported from the
+# Protobuf project need to have IMPORTED_LOCATION_STATIC defined. We use
+# 'Release' locations as Protobuf is built using 'Release' configuration in
+# that case.
+#
 
-    message("- setting generic location to: ${LOC}")
-    set_target_properties(${lib} PROPERTIES
-      IMPORTED_LOCATION "${LOC}"
-    )
+foreach(tgt protobuf protobuf-lite pb_protoc)
 
-  endif()
+  get_target_property(LOC ${tgt} IMPORTED_LOCATION_RELEASE)
+  set_property(TARGET ${tgt} PROPERTY IMPORTED_LOCATION_STATIC ${LOC})
 
-endforeach(lib)
+endforeach(tgt)
 
 
 # protobuf depends on protobuf-lite
@@ -151,17 +166,18 @@ if(NOT DEFINED PROTOBUF_BUILD_STAMP)
   message(FATAL_ERROR "Protobuf build stamp file not defined")
 endif()
 
+
 if(CMAKE_VERSION VERSION_LESS 3.0)
   add_custom_command(OUTPUT ${PROTOBUF_BUILD_STAMP}
     COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIGURATION>
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/protobuf
-    COMMENT "Building protobuf using configuration: $<CONFIGURATION>"
+    COMMENT "Building protobuf using configuration: $(Configuration)"
   )
 else()
   add_custom_command(OUTPUT ${PROTOBUF_BUILD_STAMP}
-    COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
+    COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG_EXPR}
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/protobuf
-    COMMENT "Building protobuf using configuration: $<CONFIG>"
+    COMMENT "Building protobuf using configuration: $(Configuration)"
   )
 endif()
 

cdk/cmake/ssl.cmake

@@ -412,11 +412,11 @@ function(bundle_ssl_libs)
         #message("result: ${lib_dll}")
 
         message("bundling: ${lib}")
-        install(FILES "${lib}" DESTINATION "${INSTALL_LIB_DIR_STATIC}")
+        install(FILES "${lib}" DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT OpenSSLDev)
 
         if(lib_dll)
           message("bundling: ${lib_dll}")
-          install(FILES "${lib_dll}" DESTINATION "${INSTALL_LIB_DIR}")
+          install(FILES "${lib_dll}" DESTINATION "${INSTALL_LIB_DIR}" COMPONENT OpenSSLDll)
         else()
 
           message(WARNING "Could not find DLL library for openSSL library ${lib_name} at ${lib_path}. OpenSSL libraries can not be bundled with the connector.")
@@ -434,7 +434,7 @@ function(bundle_ssl_libs)
         else()
 
           message("bundling: ${lib_file}")
-          install(FILES "${lib_file}" DESTINATION "${INSTALL_LIB_DIR_STATIC}")
+          install(FILES "${lib_file}" DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT OpenSSLDev)
           get_filename_component(lib_dir "${lib_file}" DIRECTORY)
           get_filename_component(lib_name "${lib_file}" NAME)