File 0001-Fix-cmake-system-check.patch of Package blosc

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-cmake-system-check.patch of Package blosc (Revision 5f2bbc491172c9f3aecbde590c3c2cfb)

Currently displaying revision 5f2bbc491172c9f3aecbde590c3c2cfb , Show latest

From 023d185a1e9f104f15b7800d13cf3c1b9169ab72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 7 May 2015 12:35:32 -0400
Subject: [PATCH] Fix cmake system check

Apparently the check was always evaluating to true, because cmake simply
sets the variable to whatever is on the right, not evaluating the expression.

The list of architectures was also completely random. Those seems to
be the available options (under Linux):

i386 i686 x86_64 ia64 alpha amd64 arm armeb armel hppa m32r m68k mips
mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc
---
 CMakeLists.txt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69b6525a95..39e3dcf0d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,8 +139,11 @@ endif(NOT CMAKE_BUILD_TYPE)
 # by the compiler. Note we DO NOT check which hardware features are supported
 # by this (the host) system, because we want to be able to support compiling
 # for newer hardware on older machines as well as cross-compilation.
-set(SYSTEM_PROCESSOR_INTEL_X86 ((CMAKE_SYSTEM_PROCESSOR STREQUAL i686) OR (CMAKE_SYSTEM_PROCESSOR STREQUAL x86) OR (CMAKE_SYSTEM_PROCESSOR STREQUAL AMD64)))
-if(SYSTEM_PROCESSOR_INTEL_X86)
+message(STATUS "Building for system processor ${CMAKE_SYSTEM_PROCESSOR}.")
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL i386 OR
+   CMAKE_SYSTEM_PROCESSOR STREQUAL i686 OR
+   CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 OR
+   CMAKE_SYSTEM_PROCESSOR STREQUAL amd64)
     if(CMAKE_C_COMPILER_ID STREQUAL GNU)
         set(COMPILER_SUPPORT_SSE2 TRUE)
         if(CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.7 OR CMAKE_C_COMPILER_VERSION VERSION_EQUAL 4.7)
@@ -175,7 +178,7 @@ if(SYSTEM_PROCESSOR_INTEL_X86)
         # Unrecognized compiler. Emit a warning message to let the user know hardware-acceleration won't be available.
         message(WARNING "Unable to determine which ${CMAKE_SYSTEM_PROCESSOR} hardware features are supported by the C compiler (${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION}).")
     endif()
-else(SYSTEM_PROCESSOR_INTEL_X86)
+else()
     # If the target system processor isn't recognized, emit a warning message to alert the user
     # that hardware-acceleration support won't be available but allow configuration to proceed.
     message(WARNING "Unrecognized system processor ${CMAKE_SYSTEM_PROCESSOR}. Cannot determine which hardware features (${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION}) supports, so hardware-accelerated implementations will not be available.")
-- 
2.1.0

Places

File 0001-Fix-cmake-system-check.patch of Package blosc (Revision 5f2bbc491172c9f3aecbde590c3c2cfb)

Places