Changeset 68 in flair-dev for trunk/cmake-modules/ArchDir.cmake

Timestamp:

Mar 6, 2018, 12:14:17 PM (7 years ago)

Author:

Sanahuja Guillaume

Message:

maj for armv5te

File:

• trunk/cmake-modules/ArchDir.cmake (modified) (1 diff)

trunk/cmake-modules/ArchDir.cmake

@@ -1 @@
-if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm")
-        SET(ARCH_DIR "arm")
-elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "powerpc")
-          SET(ARCH_DIR "powerpc")
+if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686")
+    message(FATAL_ERROR "i686 is not supported")
+endif()
+
+if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
+    SET(ARCH_DIR "x86_64/unix")
+elseif(DEFINED CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE)
+    SET(ARCH_DIR ${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE})
 else()
-        if(WIN32)
-                if(MINGW)
-                        if (CMAKE_SIZEOF_VOID_P MATCHES "8")#64 bits
-                                SET(ARCH_DIR "x86_64/win")
-                        else()#32 bits
-                                SET(ARCH_DIR "x86/win")
-                                ADD_DEFINITIONS(-D__MINGW__)
-                        endif()
-                else()
-                        message(FATAL_ERROR,"only supports mingw compiler")
-                endif()
-        else()  
-                if (CMAKE_SIZEOF_VOID_P MATCHES "8")#64 bits
-                        SET(ARCH_DIR "x86_64/unix")
-                else()#32 bits
-                        SET(ARCH_DIR "i686/unix")
-                endif()
-        endif()
+    SET(ARCH_DIR ${CMAKE_SYSTEM_PROCESSOR})
 endif()