diff --git a/CMakeLists.txt b/CMakeLists.txt index ec6d70e..b8d3cec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,17 +1,18 @@ # -# Copyright (c) 2020, Gilles Caulier, +# Copyright (c) 2020-2023, Gilles Caulier, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -project(ImageMosaicWall) +cmake_minimum_required(VERSION "3.16") -cmake_minimum_required(VERSION "3.1.0") +project(ImageMosaicWall) -option(ENABLE_DPLUGIN "Build digiKam plugin version of Image Mosaic Wall tool (default=OFF)" OFF) -option(BUILD_WITH_QT6 "Build with Qt6, else Qt5" OFF) +option(ENABLE_DPLUGIN "Build digiKam plugin only of Image Mosaic Wall tool (default=OFF)" OFF) +option(BUILD_WITH_QT6 "Build with Qt6, else Qt5" OFF) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) + if (ENABLE_DPLUGIN) include(MacroInstall) endif() @@ -24,6 +25,12 @@ endif() include(FeatureSummary) +if(MSVC) + add_compile_options(/utf-8) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /permissive-") +endif() + set(CMAKE_CXX_STANDARD 17) if(CMAKE_VERSION VERSION_LESS "3.7.0") @@ -34,7 +41,6 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) - if(BUILD_WITH_QT6) find_package(Qt6 "6.5.0" REQUIRED @@ -63,10 +69,29 @@ endif() find_package(Threads) -find_package(exiv2 REQUIRED) +find_package(exiv2lib REQUIRED CONFIG NAMES exiv2) + +if(exiv2lib_FOUND) + + message(STATUS "Found Exiv2 version ${exiv2lib_VERSION}") + + # Work around the cmake export rules from Exiv2 since 0.28 + + if("${exiv2lib_VERSION}" VERSION_GREATER "0.27.99") + + set(exiv2lib_LIBRARIES Exiv2::exiv2lib) + + else() + + set(exiv2lib_LIBRARIES exiv2lib) + + endif() + + message(STATUS "Exiv2 libraries: ${exiv2lib_LIBRARIES}") -set_package_properties("exiv2" PROPERTIES - DESCRIPTION "Required to build digiKam" +endif() + +set_package_properties(exiv2lib PROPERTIES URL "https://www.exiv2.org" TYPE RECOMMENDED PURPOSE "Library to manage image metadata" @@ -74,8 +99,7 @@ set_package_properties("exiv2" PROPERTIES include(i18nUtils) -include_directories($ - $ +include_directories($ $ $ $ @@ -93,7 +117,6 @@ set(imagemosaicwall_core_SRCS ${CMAKE_SOURCE_DIR}/mainwindow.cpp ${i18n_QM} ) - if(Qt6_FOUND) qt6_wrap_ui(imagemosaicwall_core_SRCS ${CMAKE_SOURCE_DIR}/mainwindow.ui @@ -119,47 +142,54 @@ set(libimagemosaicwall_core_SRCS add_library(imagemosaicwallcore STATIC ${libimagemosaicwall_core_SRCS}) +target_link_libraries(imagemosaicwallcore + PUBLIC + ${exiv2lib_LIBRARIES} +) + if(NOT MSVC) target_compile_options(imagemosaicwallcore PRIVATE -fPIC) endif() -if(APPLE) - add_executable(ImageMosaicWall MACOSX_BUNDLE ${OSX_APP_ICON} ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp) -else() - add_executable(ImageMosaicWall ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp) -endif() +if(NOT ENABLE_DPLUGIN) -target_link_libraries(ImageMosaicWall + if(APPLE) + add_executable(ImageMosaicWall MACOSX_BUNDLE ${OSX_APP_ICON} ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp) + else() + add_executable(ImageMosaicWall ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp) + endif() - imagemosaicwallcore + target_link_libraries(ImageMosaicWall - Qt${QT_VERSION_MAJOR}::Core - Qt${QT_VERSION_MAJOR}::Widgets - Qt${QT_VERSION_MAJOR}::Gui - Qt${QT_VERSION_MAJOR}::Concurrent + imagemosaicwallcore - exiv2lib - ${CMAKE_THREAD_LIBS_INIT} -) + Qt${QT_VERSION_MAJOR}::Core + Qt${QT_VERSION_MAJOR}::Widgets + Qt${QT_VERSION_MAJOR}::Gui + Qt${QT_VERSION_MAJOR}::Concurrent + + ${CMAKE_THREAD_LIBS_INIT} + ) + + if(APPLE) + set(APPS "\${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}.app") + set(DIRS "\${CMAKE_INSTALL_PREFIX}/share") -if(APPLE) - set(APPS "\${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}.app") - set(DIRS "\${CMAKE_INSTALL_PREFIX}/share") + install(TARGETS ${PROJECT_NAME} + BUNDLE DESTINATION . COMPONENT Runtime + RUNTIME DESTINATION bin COMPONENT Runtime) - install(TARGETS ${PROJECT_NAME} - BUNDLE DESTINATION . COMPONENT Runtime - RUNTIME DESTINATION bin COMPONENT Runtime - ) + install(CODE " + include(BundleUtilities) + fixup_bundle(\"${APPS}\" \"\" \"${DIRS}\") + " COMPONENT Runtime) + else() + install(TARGETS ImageMosaicWall RUNTIME DESTINATION bin) + endif() - install(CODE " - include(BundleUtilities) - fixup_bundle(\"${APPS}\" \"\" \"${DIRS}\") - " COMPONENT Runtime) else() - install(TARGETS ImageMosaicWall RUNTIME DESTINATION bin) -endif() -if (ENABLE_DPLUGIN) add_subdirectory(dplugin) MACRO_ADD_UNINSTALL_TARGET() + endif() diff --git a/dplugin/CMakeLists.txt b/dplugin/CMakeLists.txt index 2842f45..f882de8 100644 --- a/dplugin/CMakeLists.txt +++ b/dplugin/CMakeLists.txt @@ -35,8 +35,6 @@ target_link_libraries(Generic_ImageMosaicWall_Plugin Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Concurrent - - exiv2lib ) MACRO_ADD_PLUGIN_INSTALL_TARGET(Generic_ImageMosaicWall_Plugin generic) diff --git a/imageprocessing.cpp b/imageprocessing.cpp index 407d943..b4609a8 100644 --- a/imageprocessing.cpp +++ b/imageprocessing.cpp @@ -1,5 +1,6 @@ #include "imageprocessing.h" #include +#include #include #include #include @@ -18,6 +19,18 @@ # define kerErrorMessage ErrorCode::kerErrorMessage #endif +template +void my_random_shuffle(RandomIt first, RandomIt last) +{ + typedef typename std::iterator_traits::difference_type diff_t; + + for (diff_t i = last - first - 1; i > 0; --i) + { + using std::swap; + swap(first[i], first[std::rand() % (i + 1)]); + } +} + ImageProcessing::ImageProcessing(QObject *parent) : QObject(parent) , m_skipBackgroundProcess(false) @@ -189,7 +202,7 @@ void ImageProcessing::calculateMosaicPositions(const QSize gridSize, const int s for (uint32_t i = startPos; i < startPos + length; ++i) positions.push_back(i); - std::random_shuffle(positions.begin(), positions.end()); + my_random_shuffle(positions.begin(), positions.end()); for (auto pos : positions) { if (m_skipBackgroundProcess)