Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use upstream Extra CMake Modules #6810

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+20 −1,073
Open

Use upstream Extra CMake Modules #6810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af2b3a9
Use upstream extra cmake modules
claucambra Jun 12, 2024
db73616
Mark nextcloudcmd as non gui executable
claucambra Jun 12, 2024
a56b600
Fix ecm_add_app_icon calls
claucambra Jun 13, 2024
eb8d6ed
Update upstream URL for Extra CMake Modules
claucambra Jun 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,20 @@ if (NOT DEFINED PACKAGE)
set(PACKAGE "${LINUX_PACKAGE_SHORTNAME}-client")
endif()

set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
set(APPLE_SUPPRESS_X11_WARNING ON)

find_package(ECM 6.0.0 REQUIRED NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://invent.kde.org/frameworks/extra-cmake-modules")

set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})

include(KDEInstallDirs)
include(KDECMakeSettings)
Comment on lines +78 to +79
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to check how those two impact our windows builds

include(ECMMarkNonGuiExecutable)
include(ECMSetupVersion)

#include(KDECompilerSettings NO_POLICY_SCOPE)
include(ECMEnableSanitizers)

include(ECMCoverageOption)

Expand Down
Empty file removed cmake/modules/DBusMacros.cmake
View file
Open in desktop
Empty file.
415 changes: 0 additions & 415 deletions cmake/modules/ECMAddAppIcon.cmake
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions cmake/modules/ECMCoverageOption.cmake
View file
Open in desktop

This file was deleted.

169 changes: 0 additions & 169 deletions cmake/modules/ECMEnableSanitizers.cmake
View file
Open in desktop

This file was deleted.

Loading
Loading