From 7f43ef904a7386025f49db9bd4899284dcc175d5 Mon Sep 17 00:00:00 2001 From: Lorenzo Pivetta <5919598+lorenzopivetta@users.noreply.github.com> Date: Mon, 13 Jan 2020 14:57:15 +0100 Subject: [PATCH 1/4] fix build on PPC --- CMakeLists.txt | 4 ++-- configure/cmake_linux.cmake | 4 ++-- cppapi/server/CMakeLists.txt | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) 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/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_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_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 From deb8c37b1cadb497b74a9522a9373e60bf07f504 Mon Sep 17 00:00:00 2001 From: Lorenzo Pivetta <5919598+lorenzopivetta@users.noreply.github.com> Date: Thu, 16 Jan 2020 11:57:45 +0100 Subject: [PATCH 2/4] TANGO_JPEG_MMX default option --- configure/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configure/CMakeLists.txt b/configure/CMakeLists.txt index e0d18099a..a2773085b 100644 --- a/configure/CMakeLists.txt +++ b/configure/CMakeLists.txt @@ -210,5 +210,11 @@ if(NOT WIN32) endif() endif() endif() + +if (NOT TANGO_JPEG_MMX) + message("Building MMX support; use '-DTANGO_JPEG_MMX=false' to disable") + set(TANGO_JPEG_MMX true) +endif (NOT TANGO_JPEG_MMX) + include(GNUInstallDirs) include(configure/coveralls.cmake) From ac7865fd1e2fb97863619f3a20845afb99ecbf46 Mon Sep 17 00:00:00 2001 From: Lorenzo Pivetta <5919598+lorenzopivetta@users.noreply.github.com> Date: Thu, 16 Jan 2020 16:15:50 +0100 Subject: [PATCH 3/4] fix default MMX option --- configure/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure/CMakeLists.txt b/configure/CMakeLists.txt index a2773085b..0fc0d06fc 100644 --- a/configure/CMakeLists.txt +++ b/configure/CMakeLists.txt @@ -211,10 +211,12 @@ if(NOT WIN32) endif() endif() -if (NOT TANGO_JPEG_MMX) +if (TANGO_JPEG_MMX STREQUAL "false") + message("MMX support disabled") +else (TANGO_JPEG_MMX STREQUAL "false") message("Building MMX support; use '-DTANGO_JPEG_MMX=false' to disable") set(TANGO_JPEG_MMX true) -endif (NOT TANGO_JPEG_MMX) +endif (TANGO_JPEG_MMX STREQUAL "false") include(GNUInstallDirs) include(configure/coveralls.cmake) From acc962bcec595d1e28a0a6a7158e616e317d19d9 Mon Sep 17 00:00:00 2001 From: Lorenzo Pivetta <5919598+lorenzopivetta@users.noreply.github.com> Date: Mon, 20 Jan 2020 15:18:30 +0100 Subject: [PATCH 4/4] Use cmake option() to build MMX support, default ON --- configure/CMakeLists.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/configure/CMakeLists.txt b/configure/CMakeLists.txt index 0fc0d06fc..88ade5ff7 100644 --- a/configure/CMakeLists.txt +++ b/configure/CMakeLists.txt @@ -211,12 +211,7 @@ if(NOT WIN32) endif() endif() -if (TANGO_JPEG_MMX STREQUAL "false") - message("MMX support disabled") -else (TANGO_JPEG_MMX STREQUAL "false") - message("Building MMX support; use '-DTANGO_JPEG_MMX=false' to disable") - set(TANGO_JPEG_MMX true) -endif (TANGO_JPEG_MMX STREQUAL "false") +option(TANGO_JPEG_MMX "Build MMX support" ON) include(GNUInstallDirs) include(configure/coveralls.cmake)