diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2020-01-07 16:34:48 +0300 |
|---|---|---|
| committer | Hannah von Reth <vonreth@kde.org> | 2020-01-09 17:39:32 +0300 |
| commit | 6725cd5826f13dde8996f638a0d28ebb5aaa3531 (patch) | |
| tree | 1317527dcee1d149051503fdb1e11df1d04c0a31 /shell_integration | |
| parent | f17b30515167d3e679f30118e52c41385787faba (diff) | |
[CMAKE] Resolve some issues discovered during review
Diffstat (limited to 'shell_integration')
| -rw-r--r-- | shell_integration/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | shell_integration/MacOSX/CMakeLists.txt | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/shell_integration/CMakeLists.txt b/shell_integration/CMakeLists.txt index 959d94b7e..2ad9e86ab 100644 --- a/shell_integration/CMakeLists.txt +++ b/shell_integration/CMakeLists.txt @@ -11,8 +11,6 @@ if( UNIX AND NOT APPLE ) endif() if(BUILD_SHELL_INTEGRATION_DOLPHIN) - find_package(ECM 1.2.0 NO_MODULE QUIET) - set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") find_package(KF5 "5.16" COMPONENTS KIO) if(KF5_FOUND) add_subdirectory(dolphin) diff --git a/shell_integration/MacOSX/CMakeLists.txt b/shell_integration/MacOSX/CMakeLists.txt index 99216ef94..6b616a8df 100644 --- a/shell_integration/MacOSX/CMakeLists.txt +++ b/shell_integration/MacOSX/CMakeLists.txt @@ -15,9 +15,8 @@ add_custom_target( mac_overlayplugin ALL COMMENT building Mac Overlay icons VERBATIM) add_dependencies(mac_overlayplugin ${APPLICATION_EXECUTABLE}) # for the ownCloud.icns to be generated +add_custom_command(TARGET mac_overlayplugin POST_BUILD COMMAND ${CMAKE_COMMAND} + ARGS -E copy_directory "${CMAKE_CURRENT_BINARY_DIR}/Release/FinderSyncExt.appex" "$<TARGET_FILE_DIR:${APPLICATION_EXECUTABLE}>/PlugIns/FinderSyncExt.appex" MAIN_DEPENDENCY "${mac_overlayplugin}") -INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Release/FinderSyncExt.appex - DESTINATION ${PLUGIN_INSTALL_DIR} - USE_SOURCE_PERMISSIONS) -endif(APPLE) +endif() |