Skip to content
This repository was archived by the owner on Jul 8, 2022. It is now read-only.

Add switch to disable mmx build lts #676

Merged
merged 3 commits into from
Feb 14, 2020
Merged

Add switch to disable mmx build lts #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d1b8e0
Merge pull request #1 from tango-controls/tango-9-lts
lorenzopivetta Feb 3, 2020
e0b11d6
Add switch to disable building MMX
lorenzopivetta Feb 5, 2020
191ef90
Fix indentation
lorenzopivetta Feb 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions configure/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
16 changes: 12 additions & 4 deletions cppapi/server/jpeg_mmx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
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)