Fix scripts for building with MSVC

Author: evgeniums

CMakeLists.txt

@@ -234,7 +234,13 @@ ELSE (DRACOSHA_VALIDATOR_SRC)
 
     IF(WIN32)
         IF(MSVC)
-            TARGET_COMPILE_OPTIONS(${PROJECT_NAME} INTERFACE "/Zc:ternary")
+            IF (NOT CMAKE_CXX_STANDARD)
+                SET (CMAKE_CXX_STANDARD 17)
+            ENDIF()
+            IF (CMAKE_CXX_STANDARD LESS 17)
+                MESSAGE(FATAL_ERROR "\n*****************************\nOnly C++17 and later standards are supported for MSVC\nSet CMAKE_CXX_STANDARD=17 in build environment\n*****************************\n")
+            ENDIF()
+            TARGET_COMPILE_OPTIONS(${PROJECT_NAME} INTERFACE /Zc:ternary /wd4996 /Zc:__cplusplus)
         ELSE(MSVC)
             TARGET_COMPILE_DEFINITIONS(${PROJECT_NAME} INTERFACE -D_WIN32_WINNT=0x0600 -Dstrcasecmp=stricmp)
         ENDIF(MSVC)
@@ -286,15 +292,15 @@ ELSE (DRACOSHA_VALIDATOR_SRC)
     ENDIF(VALIDATOR_WITH_FMT)
 
     IF (VALIDATOR_WITH_TESTS)
-
-        MESSAGE(STATUS "Build tests for cpp-validator library")
+        MESSAGE(STATUS "Enable building tests for cpp-validator library")
         ENABLE_TESTING(true)
         ADD_SUBDIRECTORY(test)
-
+    ELSE(VALIDATOR_WITH_TESTS)
+        MESSAGE(STATUS "Skip building tests for cpp-validator library")
     ENDIF(VALIDATOR_WITH_TESTS)
 
     IF (VALIDATOR_WITH_EXAMPLES)
-        MESSAGE(STATUS "Build examples for cpp-validator library")
+        MESSAGE(STATUS "Enable building examples for cpp-validator library")
         ENABLE_TESTING(true)
         ADD_SUBDIRECTORY(examples)
     ELSE (VALIDATOR_WITH_EXAMPLES)

sample-build/win-msvc.bat

@@ -6,24 +6,24 @@ SET MSVC_ROOT=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community
 SET FMT_ROOT=%cd%\deps\fmt
 SET BOOST_ROOT=%cd%\deps\root-msvc-14.2-x86_64
 
+SET BUILD_TYPE=Release
+
 SET MSVC_COMPILER=v142
 SET COMPILER_VERSION=14.2
 
-SET BUILD_TYPE=Release
-
 SET MSVC_BUILD_ARCH=x64
 SET MSVC_ARCH=x64
 SET MSVC_TOOLSET="%MSVC_COMPILER%,host=x64"
 
 CALL "%MSVC_ROOT%\VC\Auxiliary\Build\vcvarsall.bat" %MSVC_ARCH% -vcvars_ver=%COMPILER_VERSION%
 
-SET CMAKE_PATH=%PATH%;%CMAKE_PATH%
+SET PATH=%PATH%;%CMAKE_PATH%
 
 SET SRC_DIR=%cd%\cpp-validator
 SET INSTALL_DIR=%cd%\build\cpp-validator\install
 SET BUILD_DIR=%cd%\build\cpp-validator\build
 
-IF EXIST %BUILD_DIR% rmdir /Q /S %BUILD_DIR% 
+IF EXIST %BUILD_DIR% rmdir /Q /S %BUILD_DIR%
 
 SET BASE_DIR=%cd%
 
@@ -32,14 +32,13 @@ cd %BUILD_DIR%
 
 cmake -A %MSVC_BUILD_ARCH% -T %MSVC_TOOLSET% ^
     -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% ^
-    -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^
     -DVALIDATOR_WITH_TESTS=On ^
     -DVALIDATOR_WITH_EXAMPLES=On ^
     %SRC_DIR%
 
-cmake --build . --config Release -- /m:1 /p:UseMultiToolTask=true /p:MultiProcMaxCount=8 /fileLogger
-
-cd %BASE_DIR%
+cmake --build . --config %BUILD_TYPE% -- /m:1 /p:UseMultiToolTask=true /p:MultiProcMaxCount=8 /fileLogger
 
 SET PATH=%PATH%;%BOOST_ROOT%\lib
-%BUILD_DIR%\test\Release\dracoshavalidator-test --log_level=test_suite
+ctest -VV -C %BUILD_TYPE%
+
+cd %BASE_DIR%

test/CMakeLists.txt

@@ -16,5 +16,9 @@ INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/test.cmake)
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} dracoshavalidator ${Boost_LIBRARIES})
 
+IF (MSVC)
+    SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj")
+ENDIF()
+
 ENABLE_TESTING()
-ADD_TEST(${PROJECT_NAME} ${PROJECT_NAME})
+ADD_TEST(${PROJECT_NAME} ${PROJECT_NAME} --log_level=test_suite)