Use CLANG to build windows.

Change-Id: I8c3ab3bdc3f6b03c449a77af8ea630e14f2fe99a

Author: silvakid

CMakeLists.txt

@@ -274,13 +274,15 @@ if(MSVC)
 
   add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
 
-  # Disable MSVC unreachable code warnings unless requested.
-  add_compile_options(/wd4702)
+  if(CXX_FRONTEND_MSVC)
+    # Disable MSVC unreachable code warnings unless requested.
+    add_compile_options(/wd4702)
 
-  # Disable MSVC warning C4297 as it seems to be buggy.
-  # Seehttps://connect.microsoft.com/VisualStudio/feedback/details/897611/incorrect-warning-of-c4297-for-destructor-with-try-catch-statement
+    # Disable MSVC warning C4297 as it seems to be buggy.
+    # Seehttps://connect.microsoft.com/VisualStudio/feedback/details/897611/incorrect-warning-of-c4297-for-destructor-with-try-catch-statement
 
-  add_compile_options(/wd4297)
+    add_compile_options(/wd4297)
+  endif()
 
 endif()
 

cdk/cmake/DepFindSSL.cmake

@@ -116,8 +116,9 @@ function(main)
 
     set_target_properties(openssl-applink PROPERTIES FOLDER "Misc")
     # Remove warnings from openssl applink.c
-    target_compile_options(openssl-applink PRIVATE /wd4152 /wd4996)
-
+    if(CXX_FRONTEND_MSVC)
+      target_compile_options(openssl-applink PRIVATE /wd4152 /wd4996)
+    endif()
   endif()
 
 

cdk/cmake/compiler/CLANG.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -26,6 +26,28 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+#
+# TOOLSET and CXX_FRONTEND
+#
+if(WIN32)
+  set(TOOLSET "MSVC" CACHE INTERNAL "")
+  set(TOOLSET_MSVC "1" CACHE INTERNAL "")
+  if(CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
+    set(CXX_FRONTEND "MSVC" CACHE INTERNAL "")
+    set(CXX_FRONTEND_MSVC "1" CACHE INTERNAL "")
+    # clang-cl behaves has MSVC
+    set(MSVC ${compiler_version} CACHE INTERNAL "")
+  else()
+    set(CXX_FRONTEND "GCC" CACHE INTERNAL "")
+    set(CXX_FRONTEND_GCC "1" CACHE INTERNAL "")
+  endif()
+else()
+  set(TOOLSET "GCC" CACHE INTERNAL "")
+  set(CXX_FRONTEND "GCC" CACHE INTERNAL "")
+  set(TOOLSET_GCC "1" CACHE INTERNAL "")
+  set(CXX_FRONTEND_GCC "1" CACHE INTERNAL "")
+endif()
+
 function(enable_cxx17)
 
   add_flags(CXX -std=c++17)
@@ -48,6 +70,11 @@ function(enable_cxx17)
 
 endfunction()
 
+function(enable_pic)
+  if(TOOLSET_GCC)
+    add_compile_options(-fPIC)
+  endif()
+endfunction()
 
 function(set_visibility)
   add_compile_options(-fvisibility-ms-compat)

cdk/cmake/compiler/GCC.cmake

@@ -28,6 +28,14 @@
 
 ##########################################################################
 
+#
+# TOOLSET and CXX_FRONTEND
+#
+set(TOOLSET "GCC" CACHE INTERNAL "")
+set(CXX_FRONTEND "GCC" CACHE INTERNAL "")
+set(TOOLSET_GCC "1" CACHE INTERNAL "")
+set(CXX_FRONTEND_GCC "1" CACHE INTERNAL "")
+
 #
 # Ensure relative source locations in debug entries
 #

cdk/cmake/compiler/MSVC.cmake

@@ -33,6 +33,14 @@
 
 set(ARCH ${MSVC_CXX_ARCHITECTURE_ID} CACHE INTERNAL "architecture id")
 
+#
+# If clang-cl is used, we should still set CLANG variable
+#
+
+if(compiler_id MATCHES "Clang")
+    set(CLANG ${compiler_version} CACHE INTERNAL "")
+endif()
+
 #
 # Set VS and VS_VER (MSVC toolset version)
 #
@@ -50,10 +58,14 @@ else()
 
 endif()
 
-#message("-- vs: ${VS}")
+#
+# TOOLSET and CXX_FRONTEND
+#
+set(TOOLSET "MSVC" CACHE INTERNAL "")
+set(CXX_FRONTEND "MSVC" CACHE INTERNAL "")
+set(TOOLSET_MSVC "1" CACHE INTERNAL "")
+set(CXX_FRONTEND_MSVC "1" CACHE INTERNAL "")
 
-set(VS_VER ${VS} CACHE INTERNAL "")
-set(VS     "vs${VS}" CACHE INTERNAL "")
 
 #
 # Commands for global compiler options.
@@ -63,13 +75,7 @@ function(enable_pic)
 endfunction()
 
 function(enable_cxx17)
-
-  # Note: std::shared_ptr<>::unique is deprecated in C++17 [1].
-  # TODO: Remove Supression once WL15527 is implemented
-  # [1] https://en.cppreference.com/w/cpp/memory/shared_ptr/unique
-
-  add_flags(CXX /std:c++17
-  -D_SILENCE_CXX17_SHARED_PTR_UNIQUE_DEPRECATION_WARNING)
+  add_flags(CXX /std:c++17)
 endfunction()
 
 # Note: Needs to be implemented if we ever want to change the default

cdk/cmake/dependency.cmake

@@ -57,6 +57,7 @@ set(EXT_FWD
   CMAKE_SYSTEM_NAME CMAKE_SYSTEM_VERSION
   CMAKE_SYSTEM_PROCESSOR
   CMAKE_C_COMPILER CMAKE_CXX_COMPILER
+  MSVC
 )
 
 set(EXT_DIR ${CMAKE_CURRENT_LIST_DIR}/ext CACHE INTERNAL "external project utils location")

cdk/cmake/platform.cmake

@@ -38,6 +38,16 @@
 #  MSVC/GCC/CLANG/SUNPRO   - if defined, set to compiler version
 #  SPARC
 #
+#  Variables used to define TOOLSET used to build connector
+#  TOOLSET                 - currently GCC OR MSVC
+#  TOOLSET_GCC             - defined if TOOLSET = GCC
+#  TOOLSET_MSVC            - defined if TOOLSET = MSVC
+
+#  Variables used to define compiler frontend (command-line interface)
+#  CXX_FRONTEND            - currently GCC OR MSVC
+#  CXX_FRONTEND_GCC        - defined if CXX_FRONTEND = GCC
+#  CXX_FRONTEND_MSVC       - defined if CXX_FRONTEND = MSVC
+#
 # Defines the following commands:
 #
 #  enable_pic()
@@ -196,6 +206,15 @@ else()
 endif()
 
 
+# Note: std::shared_ptr<>::unique is deprecated in C++17 [1].
+# TODO: Remove Supression once WL15527 is implemented
+# [1] https://en.cppreference.com/w/cpp/memory/shared_ptr/unique
+
+if(TOOLSET_MSVC)
+  add_flags(CXX -D_SILENCE_CXX17_SHARED_PTR_UNIQUE_DEPRECATION_WARNING)
+endif()
+
+
 ########################################################################
 
 function(platform_detection_completed)

cdk/extra/protobuf/CMakeLists.txt

@@ -89,7 +89,7 @@ endif()
 
 set_visibility(hidden)
 
-if(NOT MSVC AND NOT APPLE)
+if(NOT TOOLSET_MSVC AND NOT APPLE)
   add_compile_options(-Wno-stringop-overflow -Wno-stringop-overread)
 endif()
 

cdk/extra/protobuf/protobuf-3.19.6/cmake/CMakeLists.txt

@@ -149,7 +149,7 @@ find_package(Threads REQUIRED)
 ###     set(ZLIB_LIBRARIES)
 ###   endif (ZLIB_FOUND)
 ### endif (protobuf_WITH_ZLIB)
-### 
+###
 ### if (HAVE_ZLIB)
 ###   add_definitions(-DHAVE_ZLIB)
 ### endif (HAVE_ZLIB)
@@ -162,7 +162,7 @@ endif (protobuf_WITH_ZLIB)
 # We need to link with libatomic on systems that do not have builtin atomics, or
 # don't have builtin support for 8 byte atomics
 set(protobuf_LINK_LIBATOMIC false)
-if (NOT MSVC)
+if (TOOLSET_GCC)
   include(CheckCXXSourceCompiles)
   set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
   set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} -std=c++11)
@@ -176,7 +176,7 @@ if (NOT MSVC)
     set(protobuf_LINK_LIBATOMIC true)
   endif (NOT protobuf_HAVE_BUILTIN_ATOMICS)
   set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
-endif (NOT MSVC)
+endif ()
 
 if (protobuf_BUILD_SHARED_LIBS)
   set(protobuf_SHARED_OR_STATIC "SHARED")

cdk/foundation/CMakeLists.txt

@@ -36,34 +36,6 @@ set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++17")
 include(CheckCXXSourceCompiles)
 include(CheckTypeSize)
 
-CHECK_CXX_SOURCE_COMPILES(
-  "#include <memory>
-   void test(std::shared_ptr<int>) {};
-   int main() { return 0; }"
-  HAVE_SHARED_PTR
-)
-#message("HAVE_SHARED_PTR: ${HAVE_SHARED_PTR}")
-ADD_CONFIG(HAVE_SHARED_PTR)
-
-if (NOT HAVE_SHARED_PTR)
-  message(FATAL_ERROR "Type std::shared_ptr required by CDK is not available")
-endif()
-
-
-CHECK_CXX_SOURCE_COMPILES(
-  "#include <system_error>
-   void test(std::system_error) {};
-   int main() { return 0; }"
-  HAVE_SYSTEM_ERROR
-)
-#message("HAVE_SYSTEM_ERROR: ${HAVE_SYSTEM_ERROR}")
-ADD_CONFIG(HAVE_SYSTEM_ERROR)
-
-if (NOT HAVE_SYSTEM_ERROR)
-  message(FATAL_ERROR "Type std::system_error required by CDK is not available")
-endif()
-
-
 check_type_size("wchar_t" WCHAR_SIZE)
 add_config(WCHAR_SIZE ${WCHAR_SIZE})
 

cdk/include/mysql/cdk/foundation/CMakeLists.txt

@@ -26,32 +26,6 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-
-set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++11")
-
-INCLUDE(CheckCXXSourceCompiles)
-
-#
-# Required for static_assert.h
-#
-
-#
-# Note: on OSX with clang compiler, it seems that <string> header
-# brings in definition of static-assert. I (Rafal) could not find
-# a better header that would work
-#
-
-CHECK_CXX_SOURCE_COMPILES(
- "#include <string>
-  int main() { static_assert(true,\"Ok\"); }"
- HAVE_STATIC_ASSERT)
- ADD_CONFIG(HAVE_STATIC_ASSERT)
-
-CHECK_CXX_SOURCE_COMPILES(
- "void main() { return is_same<bool,char>::value; }"
- HAVE_IS_SAME)
- ADD_CONFIG(HAVE_IS_SAME)
-
 FILE(GLOB headers *.h)
 
 ADD_HEADERS(${headers})

cdk/include/mysql/cdk/foundation/common.h

@@ -35,7 +35,15 @@
   Macros used to disable warnings for fragments of code.
 */
 
-#if defined __GNUC__ || defined __clang__
+#if defined _MSC_VER
+
+#define PRAGMA_CDK(X) __pragma(X)
+#define DISABLE_WARNING_CDK(W) PRAGMA_CDK(warning (disable:W))
+
+#define DIAGNOSTIC_PUSH_CDK  PRAGMA_CDK(warning (push))
+#define DIAGNOSTIC_POP_CDK   PRAGMA_CDK(warning (pop))
+
+#elif defined __GNUC__ || defined __clang__ 
 
 #define PRAGMA_CDK(X) _Pragma(#X)
 #define DISABLE_WARNING_CDK(W) PRAGMA_CDK(GCC diagnostic ignored #W)
@@ -48,14 +56,7 @@
 #define DIAGNOSTIC_POP_CDK
 #endif
 
-#elif defined _MSC_VER
-
 
-#define PRAGMA_CDK(X) __pragma(X)
-#define DISABLE_WARNING_CDK(W) PRAGMA_CDK(warning (disable:W))
-
-#define DIAGNOSTIC_PUSH_CDK  PRAGMA_CDK(warning (push))
-#define DIAGNOSTIC_POP_CDK   PRAGMA_CDK(warning (pop))
 
 #else
 

cdk/include/mysql/cdk/foundation/opaque_impl.i

@@ -43,7 +43,6 @@
 */
 
 #include "opaque_impl.h"
-#include "static_assert.h"
 
 namespace cdk {
 namespace foundation {