Merge pull request #674 from lorenzopivetta/add-switch-to-disable-mmx-build

Add switch to disable building MMX

Author: t-b

configure/CMakeLists.txt

@@ -212,3 +212,5 @@ if(NOT WIN32)
 endif()
 include(GNUInstallDirs)
 include(configure/coveralls.cmake)
+
+option(TANGO_JPEG_MMX "Build MMX support" ON)

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)