diff --git a/core/libs/CMakeLists.txt b/core/cmake/modules/DNGSdkRules.cmake similarity index 56% copy from core/libs/CMakeLists.txt copy to core/cmake/modules/DNGSdkRules.cmake index aca29a17b3..489890d265 100644 --- a/core/libs/CMakeLists.txt +++ b/core/cmake/modules/DNGSdkRules.cmake @@ -1,92 +1,58 @@ # # Copyright (c) 2010-2020 by Gilles Caulier, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. #--------------------------------- -# Common DNG SDK definitions for DNGWriter and RAWEngine. +# Common DNG SDK definitions for DNGWriter. # -# Set platteforms flags. +# Set platforms flags. # NOTE: see bug #195735: do not enable Mac flags provided by Adobe. # Sounds like all compile fine like under Linux. add_definitions(-DEnablePluginManager=0) add_definitions(-DXMP_StaticBuild=1) if(MSVC) add_definitions( # XMP SDK -DWIN_ENV=1 + -DUNIX_ENV=0 # DNG SDK -DqWinOS=1 -DqMacOS=0 -DqDNGUseStdInt=0 ) else() add_definitions( # XMP SDK + -DWIN_ENV=0 -DUNIX_ENV=1 # DNG SDK -DqWinOS=0 -DqMacOS=0 -DqDNGUseStdInt=1 ) endif() # Check processor endianness include(TestBigEndian) TEST_BIG_ENDIAN(IS_BIG_ENDIAN) if(NOT IS_BIG_ENDIAN) add_definitions(-DqDNGLittleEndian) endif() # Thread safe support under Mac and Linux using pthread library if(NOT MSVC) add_definitions(-DqDNGThreadSafe) endif() # Mode definition for console output. add_definitions(-DqDNGValidateTarget) - -#--------------------------------- - -add_subdirectory(dimg) -add_subdirectory(metadataengine) -add_subdirectory(database) -add_subdirectory(dngwriter) -add_subdirectory(dtrash) -add_subdirectory(facesengine) -add_subdirectory(iojobs) -add_subdirectory(jpegutils) -add_subdirectory(pgfutils) -add_subdirectory(threadimageio) -add_subdirectory(widgets) -add_subdirectory(properties) -add_subdirectory(progressmanager) -add_subdirectory(threads) -add_subdirectory(versionmanager) -add_subdirectory(notificationmanager) -add_subdirectory(models) -add_subdirectory(template) -add_subdirectory(dialogs) -add_subdirectory(dplugins) -add_subdirectory(kmemoryinfo) -add_subdirectory(fileactionmanager) -add_subdirectory(filters) -add_subdirectory(settings) -add_subdirectory(rawengine) -add_subdirectory(album) -add_subdirectory(tags) -add_subdirectory(transitionmngr) -add_subdirectory(timeadjust) - -if(ENABLE_MEDIAPLAYER) - add_subdirectory(video) -endif() diff --git a/core/libs/CMakeLists.txt b/core/libs/CMakeLists.txt index aca29a17b3..718954de75 100644 --- a/core/libs/CMakeLists.txt +++ b/core/libs/CMakeLists.txt @@ -1,92 +1,43 @@ # # Copyright (c) 2010-2020 by Gilles Caulier, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -#--------------------------------- - -# Common DNG SDK definitions for DNGWriter and RAWEngine. -# -# Set platteforms flags. -# NOTE: see bug #195735: do not enable Mac flags provided by Adobe. -# Sounds like all compile fine like under Linux. - -add_definitions(-DEnablePluginManager=0) -add_definitions(-DXMP_StaticBuild=1) - -if(MSVC) - add_definitions( - # XMP SDK - -DWIN_ENV=1 - - # DNG SDK - -DqWinOS=1 - -DqMacOS=0 - -DqDNGUseStdInt=0 - ) -else() - add_definitions( - # XMP SDK - -DUNIX_ENV=1 - - # DNG SDK - -DqWinOS=0 - -DqMacOS=0 - -DqDNGUseStdInt=1 - ) -endif() - -# Check processor endianness -include(TestBigEndian) -TEST_BIG_ENDIAN(IS_BIG_ENDIAN) - -if(NOT IS_BIG_ENDIAN) - add_definitions(-DqDNGLittleEndian) -endif() - -# Thread safe support under Mac and Linux using pthread library - -if(NOT MSVC) - add_definitions(-DqDNGThreadSafe) -endif() - -# Mode definition for console output. - -add_definitions(-DqDNGValidateTarget) +include(${CMAKE_SOURCE_DIR}/core/cmake/modules/DNGSdkRules.cmake) #--------------------------------- add_subdirectory(dimg) add_subdirectory(metadataengine) add_subdirectory(database) add_subdirectory(dngwriter) add_subdirectory(dtrash) add_subdirectory(facesengine) add_subdirectory(iojobs) add_subdirectory(jpegutils) add_subdirectory(pgfutils) add_subdirectory(threadimageio) add_subdirectory(widgets) add_subdirectory(properties) add_subdirectory(progressmanager) add_subdirectory(threads) add_subdirectory(versionmanager) add_subdirectory(notificationmanager) add_subdirectory(models) add_subdirectory(template) add_subdirectory(dialogs) add_subdirectory(dplugins) add_subdirectory(kmemoryinfo) add_subdirectory(fileactionmanager) add_subdirectory(filters) add_subdirectory(settings) add_subdirectory(rawengine) add_subdirectory(album) add_subdirectory(tags) add_subdirectory(transitionmngr) add_subdirectory(timeadjust) if(ENABLE_MEDIAPLAYER) add_subdirectory(video) endif() diff --git a/core/tests/CMakeLists.txt b/core/tests/CMakeLists.txt index 1a9647e257..16b08c489a 100644 --- a/core/tests/CMakeLists.txt +++ b/core/tests/CMakeLists.txt @@ -1,61 +1,62 @@ # # Copyright (c) 2010-2020 by Gilles Caulier, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. # enabling for everything although only required by DImg. kde_enable_exceptions() if(APPLE) set(_extra_deps /System/Library/Frameworks/AppKit.framework) endif() set(COMMON_TEST_LINK Qt5::Core Qt5::Gui Qt5::Xml Qt5::XmlPatterns Qt5::Widgets Qt5::Concurrent Qt5::Test Qt5::Sql KF5::XmlGui KF5::I18n KF5::ConfigCore KF5::Service KF5::Solid ${_extra_deps} ) add_subdirectory(albummodel) add_subdirectory(advancedrename) add_subdirectory(database) add_subdirectory(dialogs) add_subdirectory(dimg) add_subdirectory(metadataengine) add_subdirectory(facesengine) add_subdirectory(geolocation) add_subdirectory(imgqsort) add_subdirectory(iojobs) add_subdirectory(multithreading) add_subdirectory(fileio) add_subdirectory(filters) add_subdirectory(timestampupdate) add_subdirectory(widgets) add_subdirectory(rawengine) add_subdirectory(webservices) add_subdirectory(dplugins) +add_subdirectory(dngwriter) if(ENABLE_MEDIAPLAYER) add_subdirectory(video) endif() if(ENABLE_DIGIKAM_MODELTEST) message(STATUS "Modeltest enabled") set(libdigikamgui_SRCS ${libdigikamgui_SRCS} modeltest/modeltest.cpp ) add_definitions(-DENABLE_DIGIKAM_MODELTEST) endif() diff --git a/core/tests/dngwriter/CMakeLists.txt b/core/tests/dngwriter/CMakeLists.txt index 192e68e7c2..4206884b78 100644 --- a/core/tests/dngwriter/CMakeLists.txt +++ b/core/tests/dngwriter/CMakeLists.txt @@ -1,56 +1,58 @@ # -# Copyright (c) 2010-2019, Gilles Caulier, +# Copyright (c) 2010-2020, 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(${CMAKE_SOURCE_DIR}/core/cmake/modules/DNGSdkRules.cmake) + # ======================================================= # DNGVALIDATE tool from DNG SDK set(dngvalidate_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/dngwriter/extra/dng_sdk/dng_validate.cpp) add_executable(dngvalidate ${dngvalidate_SRCS}) ecm_mark_nongui_executable(dngvalidate) target_link_libraries(dngvalidate libdng ${CMAKE_THREAD_LIBS_INIT} ) # ======================================================= # DNGINFO command line tool set(dnginfo_SRCS dnginfo.cpp) add_executable(dnginfo ${dnginfo_SRCS}) ecm_mark_nongui_executable(dnginfo) target_link_libraries(dnginfo libdng ${COMMON_TEST_LINK} ${EXPAT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ) # ======================================================= # RAW2DNG command line tool set(raw2dng_SRCS raw2dng.cpp) add_executable(raw2dng ${raw2dng_SRCS} ) ecm_mark_nongui_executable(raw2dng) target_link_libraries(raw2dng digikamcore libdng ${COMMON_TEST_LINK} ${EXPAT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} )