Selaa lähdekoodia

Add more regex for gcc, always print the ASM compiler ID

Now gcc is also recognized via "Free Software Foundation"

Alex
Alex Neundorf 14 vuotta sitten
vanhempi
sitoutus
4258b24134
1 muutettua tiedostoa jossa 8 lisäystä ja 7 poistoa
  1. 8 7
      Modules/CMakeDetermineASMCompiler.cmake

+ 8 - 7
Modules/CMakeDetermineASMCompiler.cmake

@@ -89,7 +89,7 @@ IF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
   # Table of per-vendor compiler id flags with expected output.
   LIST(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS GNU )
   SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_GNU "--version")
-  SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_GNU "(GNU assembler)|(GCC)")
+  SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_GNU "(GNU assembler)|(GCC)|(Free Software Foundation)")
 
   LIST(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS HP )
   SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_HP "-V")
@@ -114,14 +114,15 @@ IF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
   INCLUDE(CMakeDetermineCompilerId)
   CMAKE_DETERMINE_COMPILER_ID_VENDOR(ASM${ASM_DIALECT})
 
-  IF(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
-    MESSAGE(STATUS "The ASM${ASM_DIALECT} compiler identification is ${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID}")
-  ELSE(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
-    MESSAGE(STATUS "The ASM${ASM_DIALECT} compiler identification is unknown")
-  ENDIF(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
-
 ENDIF()
 
+IF(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
+  MESSAGE(STATUS "The ASM${ASM_DIALECT} compiler identification is ${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID}")
+ELSE(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
+  MESSAGE(STATUS "The ASM${ASM_DIALECT} compiler identification is unknown")
+ENDIF(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
+
+
 
 # If we have a gas/as cross compiler, they have usually some prefix, like
 # e.g. powerpc-linux-gas, arm-elf-gas or i586-mingw32msvc-gas , optionally