diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9da9adaa..7055fc987 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,9 +32,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/log4tango/include)
 #source code
 add_subdirectory("log4tango")
 add_subdirectory("cppapi")
-if(NOT WIN32)
+if(NOT WIN32 AND NOT PPC)
     add_subdirectory("cpp_test_suite")
-endif(NOT WIN32)
+endif(NOT WIN32 AND NOT PPC)
 
 if(WIN32)
     include(configure/cmake_win.cmake)
diff --git a/configure/CMakeLists.txt b/configure/CMakeLists.txt
index e0d18099a..88ade5ff7 100644
--- a/configure/CMakeLists.txt
+++ b/configure/CMakeLists.txt
@@ -210,5 +210,8 @@ if(NOT WIN32)
         endif()
     endif()
 endif()
+
+option(TANGO_JPEG_MMX "Build MMX support" ON)
+
 include(GNUInstallDirs)
 include(configure/coveralls.cmake)
diff --git a/configure/cmake_linux.cmake b/configure/cmake_linux.cmake
index 945e2d199..0a7b357f2 100644
--- a/configure/cmake_linux.cmake
+++ b/configure/cmake_linux.cmake
@@ -4,7 +4,7 @@ add_library(tango SHARED    $<TARGET_OBJECTS:log4tango_objects>
                             $<TARGET_OBJECTS:client_objects>
                             $<TARGET_OBJECTS:idl_objects>
                             $<TARGET_OBJECTS:jpeg_objects>
-                            $<TARGET_OBJECTS:jpeg_mmx_objects>
+                            $<$<BOOL:${TANGO_JPEG_MMX}>:$<TARGET_OBJECTS:jpeg_mmx_objects>>
                             $<TARGET_OBJECTS:server_objects>)
 target_link_libraries(tango PUBLIC ${ZMQ_PKG_LIBRARIES} ${OMNIORB_PKG_LIBRARIES} ${OMNICOS_PKG_LIBRARIES} ${OMNIDYN_PKG_LIBRARIES} ${CMAKE_DL_LIBS})
 target_compile_options(tango PRIVATE -fPIC)
@@ -21,7 +21,7 @@ add_library(tango-static STATIC $<TARGET_OBJECTS:log4tango_objects>
                                 $<TARGET_OBJECTS:client_objects>
                                 $<TARGET_OBJECTS:idl_objects>
                                 $<TARGET_OBJECTS:jpeg_objects>
-                                $<TARGET_OBJECTS:jpeg_mmx_objects>
+                                $<$<BOOL:${TANGO_JPEG_MMX}>:$<TARGET_OBJECTS:jpeg_mmx_objects>>
                                 $<TARGET_OBJECTS:server_objects>)
 target_link_libraries(tango-static PUBLIC ${ZMQ_PKG_LIBRARIES} ${OMNIORB_PKG_LIBRARIES} ${OMNICOS_PKG_LIBRARIES} ${OMNIDYN_PKG_LIBRARIES} ${CMAKE_DL_LIBS})
 target_include_directories(tango-static PUBLIC ${ZMQ_PKG_INCLUDE_DIRS} ${OMNIORB_PKG_INCLUDE_DIRS} ${OMNIDYN_PKG_INCLUDE_DIRS})
diff --git a/cppapi/server/CMakeLists.txt b/cppapi/server/CMakeLists.txt
index 1475915ea..d9e302dc2 100644
--- a/cppapi/server/CMakeLists.txt
+++ b/cppapi/server/CMakeLists.txt
@@ -132,7 +132,9 @@ set(HEADERS attrdesc.h
 
 add_subdirectory(idl)
 add_subdirectory(jpeg)
-add_subdirectory(jpeg_mmx)
+if (TANGO_JPEG_MMX)
+  add_subdirectory(jpeg_mmx)
+endif (TANGO_JPEG_MMX)
 
 if(WIN32)
     set(SOURCES_WIN