[C++] Enable C++ Windows build

Author: vyazelenko

.github/workflows/ci.yml

@@ -168,3 +168,17 @@ jobs:
           sudo xcode-select -switch /Applications/Xcode_${{ matrix.version }}.app
       - name: Build
         run: ./cppbuild/cppbuild
+
+  cpp-msvc-build:
+    name: C++ MSVC (Windows)
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+    env:
+      CC: cl
+      CXX: cl
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Build
+        run: cppbuild/cppbuild.cmd

CMakeLists.txt

@@ -32,6 +32,8 @@ endif ()
 option(SBE_TESTS "Enable tests" ${STANDALONE_BUILD})
 option(SBE_BUILD_SAMPLES "Enable building the sample projects" ${STANDALONE_BUILD})
 option(SBE_BUILD_BENCHMARKS "Enable building the benchmarks" ${STANDALONE_BUILD})
+option(C_WARNINGS_AS_ERRORS "Enable warnings as errors for C" OFF)
+option(CXX_WARNINGS_AS_ERRORS "Enable warnings as errors for C++" OFF)
 
 unset(STANDALONE_BUILD)
 
@@ -80,6 +82,12 @@ if (SBE_TESTS)
     ExternalProject_Get_Property(gtest binary_dir)
     set(GTEST_BINARY_DIR ${binary_dir})
 
+    if (MSVC AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+        set(GTEST_POSTFIX "d")
+    else ()
+        set(GTEST_POSTFIX "")
+    endif ()
+
     set(GTEST_LIBS
         ${GTEST_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}
         ${GTEST_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
@@ -91,17 +99,42 @@ find_package(Threads)
 
 if (UNIX)
     add_compile_options(-Wall -Wpedantic -Wextra -Wno-unused-parameter)
+
+    if (C_WARNINGS_AS_ERRORS)
+        add_compile_options($<$<COMPILE_LANGUAGE:C>:-Werror>)
+    endif (C_WARNINGS_AS_ERRORS)
+
+    if (CXX_WARNINGS_AS_ERRORS)
+        add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Werror>)
+    endif (CXX_WARNINGS_AS_ERRORS)
 endif ()
 
 if (APPLE)
     # -Wall doesn't enable everything we want to see
     add_compile_options(-Wsign-compare)
     add_definitions(-DDarwin)
+    add_compile_options(-Wno-deprecated-register)
 elseif (MSVC)
     add_definitions(-DWIN32)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+    add_definitions(-D_CRT_NONSTDC_NO_WARNINGS)
+    add_definitions(-DNOMINMAX)
+
+    if (${MSVC_VERSION} GREATER_EQUAL 1915)
+        # Acknowledge that we understand MSVC resolved a byte alignment issue in this compiler
+        add_definitions(-D_ENABLE_EXTENDED_ALIGNED_STORAGE)
+    endif ()
+
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd /Od /Zi /MP")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT /MP")
+
+    if (C_WARNINGS_AS_ERRORS)
+        add_compile_options($<$<COMPILE_LANGUAGE:C>:/WX>)
+    endif (C_WARNINGS_AS_ERRORS)
 
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd /Od /Zi")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
+    if (CXX_WARNINGS_AS_ERRORS)
+        add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/WX>)
+    endif (CXX_WARNINGS_AS_ERRORS)
 else ()
     add_definitions(-D_GNU_SOURCE)
 endif ()
@@ -111,6 +144,7 @@ set(LIBSUFFIX "${CMAKE_STATIC_LIBRARY_SUFFIX}")
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/binaries")
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib")
 
 set(SBE_JAR "${CMAKE_CURRENT_SOURCE_DIR}/sbe-all/build/libs/sbe-all-${SBE_VERSION_TXT}.jar")
 

cppbuild/cppbuild.cmd

@@ -4,6 +4,26 @@ setlocal EnableDelayedExpansion
 set SOURCE_DIR=%CD%
 set BUILD_DIR=%CD%\cppbuild\Release
 
+for %%o in (%*) do (
+
+    set PROCESSED=0
+
+    if "%%o"=="--help" (
+        echo cppbuild.cmd [--c-warnings-as-errors] [--cxx-warnings-as-errors]
+        exit /b
+    )
+
+    if "%%o"=="--c-warnings-as-errors" (
+        set EXTRA_CMAKE_ARGS=!EXTRA_CMAKE_ARGS! -DC_WARNINGS_AS_ERRORS=ON
+        set PROCESSED=1
+    )
+
+    if "%%o"=="--cxx-warnings-as-errors" (
+        set EXTRA_CMAKE_ARGS=!EXTRA_CMAKE_ARGS! -DCXX_WARNINGS_AS_ERRORS=ON
+        set PROCESSED=1
+    )
+)
+
 call cppbuild/vs-helper.cmd
 if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
 
@@ -12,8 +32,11 @@ if EXIST %BUILD_DIR% rd /S /Q %BUILD_DIR%
 md %BUILD_DIR%
 pushd %BUILD_DIR%
 
+cmake %EXTRA_CMAKE_ARGS% %SOURCE_DIR%
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
 cmake --build . --clean-first --config Release
 if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
 
-ctest -C Release
+ctest -C Release --output-on-failure
 if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%