diff --git a/core/dplugins/generic/view/glviewer/CMakeLists.txt b/core/dplugins/generic/view/glviewer/CMakeLists.txt index f45c937957..121c7a7664 100644 --- a/core/dplugins/generic/view/glviewer/CMakeLists.txt +++ b/core/dplugins/generic/view/glviewer/CMakeLists.txt @@ -1,29 +1,35 @@ # # Copyright (c) 2010-2019, Gilles Caulier, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. include(MacroDPlugins) +if(NOT MSVC) + # Under MacOS 10.14 (Mojave), OpenGL API start to be deprecated in favor to Apple Metal API. + # https://appleinsider.com/articles/18/06/28/why-macos-mojave-requires-metal----and-deprecates-opengl + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations") +endif() + include_directories($ $ $ $ $ ) set(glviewerplugin_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/glviewerplugin.cpp ${CMAKE_CURRENT_SOURCE_DIR}/glviewerhelpdlg.cpp ${CMAKE_CURRENT_SOURCE_DIR}/glviewertexture.cpp ${CMAKE_CURRENT_SOURCE_DIR}/glviewertimer.cpp ${CMAKE_CURRENT_SOURCE_DIR}/glviewerwidget.cpp ) DIGIKAM_ADD_GENERIC_PLUGIN(NAME GLViewer - SOURCES ${glviewerplugin_SRCS} - DEPENDS Qt5::OpenGL - ${OPENGL_LIBRARIES} + SOURCES ${glviewerplugin_SRCS} + DEPENDS Qt5::OpenGL + ${OPENGL_LIBRARIES} ) diff --git a/core/dplugins/generic/view/presentation/CMakeLists.txt b/core/dplugins/generic/view/presentation/CMakeLists.txt index 2825876c96..7ae0004c39 100644 --- a/core/dplugins/generic/view/presentation/CMakeLists.txt +++ b/core/dplugins/generic/view/presentation/CMakeLists.txt @@ -1,89 +1,109 @@ # # Copyright (c) 2010-2019, Gilles Caulier, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. include(MacroDPlugins) if(HAVE_MEDIAPLAYER) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/audio) + endif() if(HAVE_OPENGL) + + if(NOT MSVC) + + # Under MacOS 10.14 (Mojave), OpenGL API start to be deprecated in favor to Apple Metal API. + # https://appleinsider.com/articles/18/06/28/why-macos-mojave-requires-metal----and-deprecates-opengl + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations") + + endif() + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/opengl) include_directories($) + endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR}/dialogs ${CMAKE_CURRENT_SOURCE_DIR}/widgets ${CMAKE_CURRENT_SOURCE_DIR}/common ) include_directories($ $ $ $ ) set(presentationplugin_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/presentation_captionpage.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/presentation_advpage.cpp ${CMAKE_CURRENT_SOURCE_DIR}/widgets/presentationctrlwidget.cpp ${CMAKE_CURRENT_SOURCE_DIR}/widgets/presentationwidget.cpp ${CMAKE_CURRENT_SOURCE_DIR}/common/presentationcontainer.cpp ${CMAKE_CURRENT_SOURCE_DIR}/common/presentationloader.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/presentationdlg.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/presentation_mainpage.cpp ${CMAKE_CURRENT_SOURCE_DIR}/presentationmngr.cpp ${CMAKE_CURRENT_SOURCE_DIR}/presentationplugin.cpp ) if(HAVE_OPENGL) + set(presentationplugin_SRCS ${presentationplugin_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/opengl/presentationgl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/opengl/presentationkb.cpp ${CMAKE_CURRENT_SOURCE_DIR}/opengl/kbeffect.cpp ${CMAKE_CURRENT_SOURCE_DIR}/opengl/kbimageloader.cpp - ) + ) + endif() if(HAVE_MEDIAPLAYER) + set(presentationplugin_SRCS ${presentationplugin_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/audio/presentationaudiolist.cpp ${CMAKE_CURRENT_SOURCE_DIR}/audio/presentation_audiopage.cpp ${CMAKE_CURRENT_SOURCE_DIR}/audio/presentationaudiowidget.cpp ) ki18n_wrap_ui(presentationplugin_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/audio/presentation_audiopage.ui ${CMAKE_CURRENT_SOURCE_DIR}/audio/presentationaudiowidget.ui ) + endif() ki18n_wrap_ui(presentationplugin_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/presentation_mainpage.ui ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/presentation_captionpage.ui ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/presentation_advpage.ui ${CMAKE_CURRENT_SOURCE_DIR}/widgets/presentationctrlwidget.ui ) if(HAVE_OPENGL) + DIGIKAM_ADD_GENERIC_PLUGIN(NAME Presentation - SOURCES ${presentationplugin_SRCS} - DEPENDS Qt5::OpenGL - ${OPENGL_LIBRARIES} + SOURCES ${presentationplugin_SRCS} + DEPENDS Qt5::OpenGL + ${OPENGL_LIBRARIES} ) + else() + DIGIKAM_ADD_GENERIC_PLUGIN(NAME Presentation - SOURCES ${presentationplugin_SRCS} + SOURCES ${presentationplugin_SRCS} ) + endif()