From e0b11d603294c98043b3c263b4361575f019cf30 Mon Sep 17 00:00:00 2001
From: Lorenzo Pivetta <5919598+lorenzopivetta@users.noreply.github.com>
Date: Wed, 5 Feb 2020 14:02:46 +0100
Subject: [PATCH 1/2] Add switch to disable building MMX

---
 configure/CMakeLists.txt              |  1 +
 cppapi/server/jpeg_mmx/CMakeLists.txt | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/configure/CMakeLists.txt b/configure/CMakeLists.txt
index 34e98406b..8dbae7717 100644
--- a/configure/CMakeLists.txt
+++ b/configure/CMakeLists.txt
@@ -239,3 +239,4 @@ include(GNUInstallDirs)
 include(configure/coveralls.cmake)
 
 option(TANGO_USE_USING_NAMESPACE "Use \"using namespace\" in header files (deprecated, but ON for backwards compatibility.)." ON)
+option(TANGO_JPEG_MMX "Build MMX support" ON)
diff --git a/cppapi/server/jpeg_mmx/CMakeLists.txt b/cppapi/server/jpeg_mmx/CMakeLists.txt
index 927e902c7..5cf51d0ca 100644
--- a/cppapi/server/jpeg_mmx/CMakeLists.txt
+++ b/cppapi/server/jpeg_mmx/CMakeLists.txt
@@ -20,21 +20,29 @@ if(WIN32)
         target_compile_definitions(jpeg_mmx_objects_sta PRIVATE _64BITS)
     else()
         target_compile_options(jpeg_mmx_objects_dyn PRIVATE -O0)
-        target_compile_definitions(jpeg_mmx_objects_dyn PRIVATE JPG_USE_ASM)
-        target_compile_options(jpeg_mmx_objects_sta PRIVATE -O0)
-        target_compile_definitions(jpeg_mmx_objects_sta PRIVATE JPG_USE_ASM)
+	target_compile_options(jpeg_mmx_objects_sta PRIVATE -O0)
+	if(TANGO_JPEG_MMX)
+            target_compile_definitions(jpeg_mmx_objects_dyn PRIVATE JPG_USE_ASM)
+            target_compile_definitions(jpeg_mmx_objects_sta PRIVATE JPG_USE_ASM)
+	endif()
     endif()
 
 else(WIN32)
 
     add_library(jpeg_mmx_objects OBJECT ${SOURCES})
-    target_compile_options(jpeg_mmx_objects PRIVATE -mmmx -fPIC)
+    if(TANGO_JPEG_MMX)
+    	target_compile_options(jpeg_mmx_objects PRIVATE -mmmx -fPIC)
+    else()
+        target_compile_options(jpeg_mmx_objects PRIVATE -fPIC)
+    endif()
 
     if(${PLATFORM} EQUAL 64)
         target_compile_definitions(jpeg_mmx_objects PRIVATE _64BITS)
     else()
         target_compile_options(jpeg_mmx_objects PRIVATE -O0)
-        target_compile_definitions(jpeg_mmx_objects PRIVATE JPG_USE_ASM)
+        if(TANGO_JPEG_MMX)
+            target_compile_definitions(jpeg_mmx_objects PRIVATE JPG_USE_ASM)
+        endif()
     endif()
 
 endif(WIN32)

From 191ef90559ada12d8c62253e94d0f460dd3f9c63 Mon Sep 17 00:00:00 2001
From: Lorenzo Pivetta <5919598+lorenzopivetta@users.noreply.github.com>
Date: Thu, 13 Feb 2020 17:41:48 +0100
Subject: [PATCH 2/2] Fix indentation

---
 cppapi/server/jpeg_mmx/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cppapi/server/jpeg_mmx/CMakeLists.txt b/cppapi/server/jpeg_mmx/CMakeLists.txt
index 5cf51d0ca..441776349 100644
--- a/cppapi/server/jpeg_mmx/CMakeLists.txt
+++ b/cppapi/server/jpeg_mmx/CMakeLists.txt
@@ -20,18 +20,18 @@ if(WIN32)
         target_compile_definitions(jpeg_mmx_objects_sta PRIVATE _64BITS)
     else()
         target_compile_options(jpeg_mmx_objects_dyn PRIVATE -O0)
-	target_compile_options(jpeg_mmx_objects_sta PRIVATE -O0)
-	if(TANGO_JPEG_MMX)
+        target_compile_options(jpeg_mmx_objects_sta PRIVATE -O0)
+        if(TANGO_JPEG_MMX)
             target_compile_definitions(jpeg_mmx_objects_dyn PRIVATE JPG_USE_ASM)
             target_compile_definitions(jpeg_mmx_objects_sta PRIVATE JPG_USE_ASM)
-	endif()
+        endif()
     endif()
 
 else(WIN32)
 
     add_library(jpeg_mmx_objects OBJECT ${SOURCES})
     if(TANGO_JPEG_MMX)
-    	target_compile_options(jpeg_mmx_objects PRIVATE -mmmx -fPIC)
+        target_compile_options(jpeg_mmx_objects PRIVATE -mmmx -fPIC)
     else()
         target_compile_options(jpeg_mmx_objects PRIVATE -fPIC)
     endif()