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

Fix build on ppc 3 #657

Closed
lorenzopivetta wants to merge 4 commits into from
Closed

Fix build on ppc 3 #657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f43ef9
fix build on PPC
lorenzopivetta Jan 13, 2020
deb8c37
TANGO_JPEG_MMX default option
lorenzopivetta Jan 16, 2020
ac7865f
fix default MMX option
lorenzopivetta Jan 16, 2020
acc962b
Use cmake option() to build MMX support, default ON
lorenzopivetta Jan 20, 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
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions configure/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,5 +210,8 @@ if(NOT WIN32)
endif()
endif()
endif()

option(TANGO_JPEG_MMX "Build MMX support" ON)

include(GNUInstallDirs)
include(configure/coveralls.cmake)
4 changes: 2 additions & 2 deletions configure/cmake_linux.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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})
Expand Down
4 changes: 3 additions & 1 deletion cppapi/server/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down