[ros-diffs] [tfaber] 60803: [CMAKE] - Add /FS to VS 2013 build to fix issues with concurrent access to PDB files. Patch by David Quintana - Use subsystem version 5.02 for x64, because 5.01 doesn't exist CORE-7...

Author: tfaber
Date: Thu Oct 31 09:59:55 2013
New Revision: 60803

URL: http://svn.reactos.org/svn/reactos?rev=60803&view=rev
Log:
[CMAKE]
- Add /FS to VS 2013 build to fix issues with concurrent access to PDB files. Patch by
David Quintana
- Use subsystem version 5.02 for x64, because 5.01 doesn't exist
CORE-7434 #resolve

Modified:
    trunk/reactos/cmake/msvc.cmake

Modified: trunk/reactos/cmake/msvc.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=60803…
==============================================================================
--- trunk/reactos/cmake/msvc.cmake	[iso-8859-1] (original)
+++ trunk/reactos/cmake/msvc.cmake	[iso-8859-1] Thu Oct 31 09:59:55 2013
@@ -24,8 +24,13 @@
 
 # HACK: for VS 11+ we need to explicitly disable SSE, which is off by
 # default for older compilers. See CORE-6507
-if (MSVC_VERSION GREATER 1699 AND ARCH STREQUAL "i386")
+if(MSVC_VERSION GREATER 1699 AND ARCH STREQUAL "i386")
     add_compile_flags("/arch:IA32")
+endif ()
+
+# VS 12+ requires /FS when used in parallel compilations
+if(MSVC_VERSION GREATER 1799 AND NOT MSVC_IDE)
+    add_compile_flags("/FS")
 endif ()
 
 # C++ exception specification ignored... yeah we don't care
@@ -111,7 +116,11 @@
 
 function(set_subsystem MODULE SUBSYSTEM)
     if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 17)
-        add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM},5.01")
+        if(ARCH STREQUAL "amd64")
+            add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM},5.02")
+        else()
+            add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM},5.01")
+        endif()
     else()
         add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM}")
     endif()