[Openmp-commits] [openmp] r231384 - moved Windows-specific flags under the WINDOWS guard in CMake

[Andrey Churbanov]

Author: achurbanov
Date: Thu Mar  5 11:50:48 2015
New Revision: 231384

URL: http://llvm.org/viewvc/llvm-project?rev=231384&view=rev
Log:
moved Windows-specific flags under the WINDOWS guard in CMake

Modified:
    openmp/trunk/runtime/cmake/Intel/AsmFlags.cmake

Modified: openmp/trunk/runtime/cmake/Intel/AsmFlags.cmake
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/cmake/Intel/AsmFlags.cmake?rev=231384&r1=231383&r2=231384&view=diff
==============================================================================
--- openmp/trunk/runtime/cmake/Intel/AsmFlags.cmake (original)
+++ openmp/trunk/runtime/cmake/Intel/AsmFlags.cmake Thu Mar  5 11:50:48 2015
@@ -18,18 +18,18 @@
 function(append_assembler_specific_asm_flags input_asm_flags)
     set(local_asm_flags)
     append_asm_flags("-x assembler-with-cpp") # Assembly file that needs to be preprocessed
-    if(${IA32})
-        append_asm_flags("-safeseh") # Registers exception handlers for safe exception handling.
-        append_asm_flags("-coff") # Generates common object file format (COFF) type of object module. 
-                                  # Generally required for Win32 assembly language development.
-        append_asm_flags("-D _M_IA32")
-    elseif(${INTEL64})
-        append_asm_flags("-D _M_AMD64")
-    endif()
     if(${MIC})
         append_asm_flags("-mmic") # Build Intel(R) MIC Architecture native code
     endif()
     if(${WINDOWS})
+        if(${IA32})
+            append_asm_flags("-safeseh") # Registers exception handlers for safe exception handling.
+            append_asm_flags("-coff") # Generates common object file format (COFF) type of object module. 
+                                      # Generally required for Win32 assembly language development.
+            append_asm_flags("-D _M_IA32")
+        elseif(${INTEL64})
+            append_asm_flags("-D _M_AMD64")
+        endif()
         # CMake prefers the /MD flags when compiling Windows sources, but libiomp5 needs to use /MT instead
         # So we replace these /MD instances with /MT within the CMAKE_*_FLAGS variables and put that out to the CACHE.
         # replace_md_with_mt() is in HelperFunctions.cmake