Index: HiGHS-1.6.0/src/CMakeLists.txt
===================================================================
--- HiGHS-1.6.0/src/CMakeLists.txt	(revision 14560)
+++ HiGHS-1.6.0/src/CMakeLists.txt	(revision 14566)
@@ -791,7 +791,11 @@
     RUNTIME
     INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/highs
     MODULES DESTINATION modules)
-  install(FILES ${HIGHS_BINARY_DIR}/modules/highs_fortran_api.mod DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/highs/fortran)
+  IF (NOT MSVC)
+    install(FILES ${HIGHS_BINARY_DIR}/modules/highs_fortran_api.mod DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/highs/fortran)
+  ELSE ()
+    install(FILES ${HIGHS_BINARY_DIR}/modules/${CMAKE_BUILD_TYPE}/highs_fortran_api.mod DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/highs/fortran)
+  ENDIF()
   set_target_properties(FortranHighs PROPERTIES INSTALL_RPATH
     "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
 endif(FORTRAN_FOUND)
Index: HiGHS-1.6.0/CMakeLists.txt
===================================================================
--- HiGHS-1.6.0/CMakeLists.txt	(revision 14560)
+++ HiGHS-1.6.0/CMakeLists.txt	(revision 14566)
@@ -265,10 +265,10 @@
 
 # If Visual Studio targets are being built.
 if(MSVC)
-  add_definitions(/W4)
-  add_definitions(/wd4018 /wd4061 /wd4100 /wd4101 /wd4127 /wd4189 /wd4244 /wd4245 /wd4267 /wd4324 /wd4365 /wd4389 /wd4456 /wd4457 /wd4458 /wd4459 /wd4514 /wd4701 /wd4820)
-  add_definitions(/MP)
-  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+  add_compile_options("$<$<COMPILE_LANGUAGE:C,CXX>:/W4>")
+  # add_compile_options("$<$<COMPILE_LANGUAGE:C,CXX>:/wd4018 /wd4061 /wd4100 /wd4101 /wd4127 /wd4189 /wd4244 /wd4245 /wd4267 /wd4324 /wd4365 /wd4389 /wd4456 /wd4457 /wd4458 /wd4459 /wd4514 /wd4701 /wd4820>")
+  add_compile_options("$<$<COMPILE_LANGUAGE:C,CXX>:/MP>")
+  add_compile_options("$<$<COMPILE_LANGUAGE:C,CXX>:-D_CRT_SECURE_NO_WARNINGS>")
 
   if(STDCALL)
     # /Gz - stdcall calling convention
@@ -284,9 +284,9 @@
 
 if(NOT FAST_BUILD OR FORTRAN)
   include(CheckLanguage)
-  if(NOT MSVC)
-    check_language("Fortran")
-  endif()
+  #if(NOT MSVC)
+  check_language("Fortran")
+  #endif()
   if(CMAKE_Fortran_COMPILER)
     enable_language(Fortran)
     set(FORTRAN_FOUND ON)