Merge branch 'refs/heads/wl12755-tls-ciphers'

Author: rsomla1

.gitignore

@@ -1 +1,3 @@
 /INFO_SRC
+/CMakeSettings.json
+.vs

CMakeLists.txt

@@ -55,6 +55,10 @@ ENDIF()
 #
 set(CMAKE_INSTALL_PREFIX "" CACHE PATH "Install location")
 
+#
+# Enable grouping targets into folders for IDE tools
+#
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 
 ##########################################################################
@@ -76,6 +80,9 @@ include(libutils)        # merge_libraries()
 message("Building on system: ${CMAKE_SYSTEM} (${CMAKE_SYSTEM_PROCESSOR})")
 message("Using cmake generator: ${CMAKE_GENERATOR}")
 #message("Compiler identification: ${CMAKE_CXX_COMPILER_ID}")
+if(DEFINED CMAKE_GENERATOR_TOOLSET)
+  message("Using toolset: ${CMAKE_GENERATOR_TOOLSET}")
+endif()
 
 
 if(SUNPRO)
@@ -190,6 +197,7 @@ add_config_option(BUILD_STATIC BOOLEAN DEFAULT OFF
 )
 
 if(BUILD_STATIC)
+
   message("Building static connector library")
   set(BUILD_SHARED_LIBS OFF)
 
@@ -200,6 +208,7 @@ if(BUILD_STATIC)
   )
 
 else()
+
   message("Building shared connector library")
   set(BUILD_SHARED_LIBS ON)
 
@@ -306,6 +315,9 @@ endif()
 
 add_subdirectory(cdk)
 
+foreach(T cdk cdk_foundation cdk_mysqlx cdk_proto_mysqlx cdk_parser)
+  set_target_properties(${T} PROPERTIES FOLDER "CDK")
+endforeach()
 
 #
 # Unit tests framework
@@ -554,6 +566,7 @@ ENDIF (WITH_TESTS)
 add_executable(try EXCLUDE_FROM_ALL try.cc)
 target_link_libraries(try connector)
 
+
 if(WITH_JDBC)
 
   add_executable(try_jdbc EXCLUDE_FROM_ALL try_jdbc.cc)
@@ -646,6 +659,8 @@ add_custom_target(link_test
   VERBATIM
 )
 
+set_target_properties(link_test PROPERTIES FOLDER "Tests")
+
 add_dependencies(link_test connector)
 #if(TARGET connector-merge)
 #  add_dependencies(link_test connector-merge)

cdk/cmake/DepFindProtobuf.cmake

@@ -85,10 +85,19 @@ set(CONFIG_EXPR
   $<$<CONFIG:Static>:Release>$<$<NOT:$<CONFIG:Static>>:$<CONFIG>>
 )
 
+set(set_arch)
+if(CMAKE_GENERATOR_PLATFORM)
+  set(set_arch -A ${CMAKE_GENERATOR_PLATFORM})
+endif()
+
+set(set_toolset)
+if(CMAKE_GENERATOR_TOOLSET)
+  set(set_toolset -T ${CMAKE_GENERATOR_TOOLSET})
+endif()
 
 if(NOT EXISTS "${PB_BINARY_DIR}/exports.cmake")
 
-  message("==== Configuring Protobuf build using cmake generator: ${CMAKE_GENERATOR}")
+  message("==== Configuring Protobuf build using cmake generator: ${CMAKE_GENERATOR} ${set_arch} ${set_toolset}")
 
   file(REMOVE "${PB_BINARY_DIR}/CMakeCache.txt")
   file(MAKE_DIRECTORY "${PB_BINARY_DIR}")
@@ -102,6 +111,8 @@ if(NOT EXISTS "${PB_BINARY_DIR}/exports.cmake")
   execute_process(
     COMMAND ${CMAKE_COMMAND}
       -G "${CMAKE_GENERATOR}"
+      ${set_arch}
+      ${set_toolset}
       ${set_build_type}
       -DSTATIC_MSVCRT=${STATIC_MSVCRT}
       -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
@@ -251,6 +262,8 @@ add_custom_target(build_protobuf
   SOURCES "${build_stamp}"
 )
 
+set_target_properties(build_protobuf PROPERTIES FOLDER "Misc")
+
 add_dependencies(Protobuf::pb-full build_protobuf)
 add_dependencies(Protobuf::pb-lite build_protobuf)
 add_dependencies(Protobuf::protoc  build_protobuf)

cdk/cmake/DepFindSSL.cmake

@@ -118,6 +118,7 @@ function(main)
     add_library(openssl-applink STATIC "${OPENSSL_INCLUDE_DIR}/openssl/applink.c")
     target_link_libraries(SSL::ssl INTERFACE openssl-applink)
 
+    set_target_properties(openssl-applink PROPERTIES FOLDER "Misc")
     # Remove warnings from openssl applink.c
     target_compile_options(openssl-applink PRIVATE /wd4152 /wd4996)
 

cdk/cmake/headers.cmake

@@ -406,6 +406,7 @@ if(WITH_HEADER_CHECKS)
     COMMENT "Header checks"
     SOURCES ${all_headers}
   )
+  set_target_properties(Headers PROPERTIES FOLDER "Tests")
 
   #
   # Configure the sanity checks project. All CMakeLists.txt files defining the project

cdk/cmake/testing.cmake

@@ -143,6 +143,7 @@ IF(WITH_TESTS)
   set_global(test_tests ${test_tests})
 
   add_library(${TEST} OBJECT ${ARGN})
+  set_target_properties(${TEST} PROPERTIES FOLDER "Tests")
 
   target_include_directories(${TEST} PRIVATE ${test_includes})
 
@@ -152,6 +153,7 @@ IF(WITH_TESTS)
 
     target_compile_definitions(${TEST} PRIVATE
       -D_SCL_SECURE_NO_WARNINGS
+      -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
     )
 
     target_compile_options(${TEST} PRIVATE
@@ -276,6 +278,7 @@ IF(WITH_TESTS)
                  ${CMAKE_CURRENT_BINARY_DIR}/tests_main.cc
                  ${test_sources}
   )
+  set_target_properties(${target_run_unit_tests} PROPERTIES FOLDER "Tests")
 
   TARGET_LINK_LIBRARIES(${target_run_unit_tests} gtest)
 
@@ -285,6 +288,11 @@ IF(WITH_TESTS)
 
   if (MSVC)
 
+    target_compile_definitions(${target_run_unit_tests} PRIVATE
+      -D_SCL_SECURE_NO_WARNINGS
+      -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
+    )
+
     target_compile_options(${target_run_unit_tests} PRIVATE
       /wd4244
       /wd4267
@@ -345,6 +353,8 @@ IF(WITH_TESTS)
      SOURCES ${tests_dir}/test_main.in
   )
 
+  set_target_properties(${cdk_target_prefix}update_test_groups PROPERTIES FOLDER "Tests")
+
 ENDIF()
 ENDMACRO(ADD_TEST_TARGET)
 

cdk/extra/uuid/src/CMakeLists.txt

@@ -41,6 +41,7 @@ SET (UUID_SRCS uuid_gen.cc)
 ADD_LIBRARY(uuid_gen STATIC ${UUID_SRCS})
 
 SET_TARGET_PROPERTIES(uuid_gen PROPERTIES LINKER_LANGUAGE CXX)
+set_target_properties(uuid_gen PROPERTIES FOLDER "Misc")
 
 get_filename_component(INC_DIR "../include" ABSOLUTE)
 target_include_directories(uuid_gen PUBLIC ${INC_DIR})