Merge pull request #319 from sbriseid/vs2022_compile_fix

Added support for VS 2022.

Author: sbriseid

INSTALL

@@ -59,13 +59,18 @@ you may try this option and see if it works. Requires Boost: www.boost.org.
 Windows
 *********
 
-The code has been tested using Visual Studio 2015 and 2019, with x64.
+The code has been tested using Visual Studio 2015, 2019 and 2022, with x64.
 
 Make sure that your installment of Visual Studio includes support for Visual C++. When installing Visual
 Studio you should select "Desktop development with C++" from the Workloads options. If you did not do
 that then you must launch the Visual Studio installer and select "Modify", then select "Desktop
 development with C++". Follow further instructions.
 
+Note that Visual Studio introduced binary compatibility in Visual Studio 2015, allowing the user to mix
+binaries built by the VS toolsets v140, v141, v142 and v143 (Visual Studio 2015 and later, with some
+specific restrictions). The linker must use a toolset at least as recent as the newest toolset used by
+the binaries.
+
 How to edit environment variables:
 - Open the settings application.
 - Search for env, select: "Edit the system environment variables" (or "Edit environment variables for
@@ -88,7 +93,7 @@ Qt:
   'C:\Qt\5.15.2\msvc2019_64'.
 - If you have more than one version of Visual Studio installed this variable may need to be changed
   accordingly if you switch to another version of Visual Studio. CMake must then be restarted and
-  the cache deleted.
+  the cache deleted. Note that binary compatibility may deem this step unnecessary.
 - You must also add the variable QT_QPA_PLATFORM_PLUGIN_PATH to the system environment
   variables. This variable refers to the platform plugins and is set to
   '${QTDIR}\plugins\platforms'. Starting from a clean build the build process must be run twice in

README

@@ -20,10 +20,11 @@ Newmat was written by Robert Davies, http://www.robertnz.com.
 Requirements:
 * CMake - see: www.cmake.org
 * Linux: Tested on the latest LTS version of Ubuntu (currently 20.04, using gcc version 9.3.0) on
-  x64. It should work with gcc versions down to 4.8, but is not actively supported. It has been
+  x64. It should work with gcc versions down to 4.8, but it is not actively supported. It has been
   tested to run on ARM64, but it is not actively supported.
-* Windows: Tested with Visual Studio 2015 and 2019 on x64. Older versions are not supported. It has
-  been tested to run on ARM64, but it is not actively supported.
+* Windows: Tested with Visual Studio 2015, 2019 and 2022 on x64. Older versions are not
+  supported. It has been tested to run on ARM64 (using x64 emulation), but it is not actively
+  supported.
 * MacOS: We do not officially support MacOS. It has beed tested to run on ARM64, but it is not
   actively supported.
 

compositemodel/cmake/Modules/FindPugiXML.cmake

@@ -29,6 +29,10 @@ if(WIN32)
   elseif((${MSVC_VERSION} GREATER_EQUAL 1920) AND (${MSVC_VERSION} LESS 1930))
     # MESSAGE("Visual Studio 2019!")
     set(MSVC_NAME "msvc2019_")
+  elseif((${MSVC_VERSION} EQUAL 1930))
+    set(MSVC_NAME "msvc2022_")
+  else()
+    message("MSVC version not supported or not installed!")
   endif()
   if(CMAKE_CL_64)
     set(WIN_LIB_TYPE "64")

lrsplines2D/CMakeLists.txt

@@ -13,7 +13,8 @@ INCLUDE_DIRECTORIES(
   ${GoLRspline2D_SOURCE_DIR}/include
   ${GoToolsCore_SOURCE_DIR}/include
   ${GoTools_COMMON_INCLUDE_DIRS}
-  )
+  ${Boost_INCLUDE_DIRS}
+)
 
 
 # Linked in libraries

viewlib/cmake/Modules/FindJsonCpp.cmake

@@ -21,7 +21,11 @@ if(WIN32)
   elseif((${MSVC_VERSION} GREATER_EQUAL 1920) AND (${MSVC_VERSION} LESS 1930))
     # MESSAGE("Visual Studio 2019!")
     set(MSVC_NAME "msvc2019_")
-  endif()
+  elseif((${MSVC_VERSION} EQUAL 1930))
+    set(MSVC_NAME "msvc2022_")
+  else()
+    message("MSVC version not supported or not installed!")
+endif()
   if(CMAKE_CL_64)
     set(WIN_LIB_TYPE "64")
 #    message("The project is set to 64 bits!")