From bf53a074d69d2cb86b5b80b1c7e29a355079bc7e Mon Sep 17 00:00:00 2001 From: artyom-fedosov Date: Tue, 1 Sep 2026 14:25:47 +0300 Subject: [PATCH 1/4] style(cmake): remove redundant conditions from endif/endfunction/endmacro/endforeach Repeating the opening command's arguments in closing commands is a legacy CMake requirement dropped since CMake 3.13. Since the project requires CMake at least 3.16, the arguments are unnecessary. Signed-off-by: artyom-fedosov --- CMakeLists.txt | 8 ++-- CPackOptions.cmake.in | 2 +- cmake/modules/AddCMockaTest.cmake | 4 +- cmake/modules/CheckCCompilerFlagSSP.cmake | 2 +- cmake/modules/DefineCompilerFlags.cmake | 18 ++++---- cmake/modules/DefineInstallationPaths.cmake | 4 +- cmake/modules/DefinePlatformDefaults.cmake | 12 +++--- cmake/modules/FindCMocka.cmake | 2 +- cmake/modules/FindLibSSH.cmake | 12 +++--- cmake/modules/FindPackageVersionCheck.cmake | 22 +++++----- cmake/modules/FindSMBClient.cmake | 6 +-- cmake/modules/MacroAddCompileFlags.cmake | 4 +- cmake/modules/MacroAddLinkFlags.cmake | 4 +- .../modules/MacroEnsureOutOfSourceBuild.cmake | 4 +- cmake/modules/MacroLogFeature.cmake | 42 +++++++++---------- cmake/modules/MacroOptionalFindPackage.cmake | 10 ++--- cmake/modules/UseDoxygen.cmake | 34 +++++++-------- cmake/modules/Warnings.cmake | 2 +- .../libcloudproviders/CMakeLists.txt | 4 +- src/CMakeLists.txt | 2 +- src/csync/CMakeLists.txt | 4 +- src/csync/ConfigureChecks.cmake | 2 +- src/gui/CMakeLists.txt | 6 +-- src/libsync/CMakeLists.txt | 2 +- test/CMakeLists.txt | 4 +- 25 files changed, 108 insertions(+), 108 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7584b6b997ec9..e7956e35f05cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -302,8 +302,8 @@ add_definitions(-DNTDDI_VERSION=0x0A000004) # Also: Disable compiler warnings because we don't use Windows CRT safe-functions explicitly and don't intend to # as this is a pure cross-platform source the only alternative would be a ton of ifdefs with calls to the _s version add_definitions( -D_CRT_SECURE_NO_WARNINGS ) - endif( MSVC ) -endif( WIN32 ) + endif() +endif() if (APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") @@ -318,8 +318,8 @@ if(BUILD_CLIENT) if(NOT BUILD_LIBRARIES_ONLY) if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin) add_subdirectory(admin) - endif(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin) - endif(NOT BUILD_LIBRARIES_ONLY) + endif() + endif() endif() if(BUILD_SHELL_INTEGRATION) diff --git a/CPackOptions.cmake.in b/CPackOptions.cmake.in index d38c4bf28b81b..d52de63fe36fa 100644 --- a/CPackOptions.cmake.in +++ b/CPackOptions.cmake.in @@ -9,7 +9,7 @@ if(CPACK_GENERATOR MATCHES "NSIS") SET( CPACK_PACKAGE_ICON @CMAKE_SOURCE_DIR@/admin/win/nsi/installer.ico ) # A branding image that will be displayed on the top bar inside the installer. installer.bmp SET( CPACK_NSIS_COMPRESSOR "/SOLID lzma" ) # The arguments that will be passed to the NSIS SetCompressor command. /SOLID lzma -endif(CPACK_GENERATOR MATCHES "NSIS") +endif() set( CMAKE_SOURCE_DIR @CMAKE_SOURCE_DIR@ ) set( CMAKE_BINARY_DIR @CMAKE_BINARY_DIR@ ) diff --git a/cmake/modules/AddCMockaTest.cmake b/cmake/modules/AddCMockaTest.cmake index 4ff77fcbbe9fc..e4f48e8bc69b7 100644 --- a/cmake/modules/AddCMockaTest.cmake +++ b/cmake/modules/AddCMockaTest.cmake @@ -15,11 +15,11 @@ if(CMAKE_COMPILER_IS_GNUCC AND NOT MINGW) set(CMAKE_SHARED_LINKER_FLAGS_PROFILING " -fprofile-arcs -ftest-coverage" CACHE STRING "Profiling Linker Flags") set(CMAKE_MODULE_LINKER_FLAGS_PROFILING " -fprofile-arcs -ftest-coverage" CACHE STRING "Profiling Linker Flags") set(CMAKE_EXEC_LINKER_FLAGS_PROFILING " -fprofile-arcs -ftest-coverage" CACHE STRING "Profiling Linker Flags") -endif(CMAKE_COMPILER_IS_GNUCC AND NOT MINGW) +endif() function (ADD_CMOCKA_TEST _testName _testSource) add_executable(${_testName} ${_testSource}) set_target_properties(${_testName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY}) target_link_libraries(${_testName} ${ARGN}) add_test(${_testName} ${BIN_OUTPUT_DIRECTORY}/${_testName}) -endfunction (ADD_CMOCKA_TEST) +endfunction () diff --git a/cmake/modules/CheckCCompilerFlagSSP.cmake b/cmake/modules/CheckCCompilerFlagSSP.cmake index db1bbc267e124..5cf8646b2b138 100644 --- a/cmake/modules/CheckCCompilerFlagSSP.cmake +++ b/cmake/modules/CheckCCompilerFlagSSP.cmake @@ -24,4 +24,4 @@ function(CHECK_C_COMPILER_FLAG_SSP _FLAG _RESULT) set(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}") check_c_source_compiles("int main(int argc, char **argv) { char buffer[256]; return buffer[argc]=0;}" ${_RESULT}) set(CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}") -endfunction(CHECK_C_COMPILER_FLAG_SSP) +endfunction() diff --git a/cmake/modules/DefineCompilerFlags.cmake b/cmake/modules/DefineCompilerFlags.cmake index ce2073912253c..df99f5aa1f9e6 100644 --- a/cmake/modules/DefineCompilerFlags.cmake +++ b/cmake/modules/DefineCompilerFlags.cmake @@ -32,18 +32,18 @@ if (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)") set(CSYNC_STRICT OFF CACHE BOOL "Strict error checking, enabled -Werror and friends") if (CSYNC_STRICT) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") - endif(CSYNC_STRICT) + endif() # with -fPIC check_c_compiler_flag("-fPIC" WITH_FPIC) if (WITH_FPIC AND NOT WIN32) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") - endif (WITH_FPIC AND NOT WIN32) + endif () check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR) if (WITH_STACK_PROTECTOR AND NOT WIN32) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector") - endif (WITH_STACK_PROTECTOR AND NOT WIN32) + endif () if (CMAKE_BUILD_TYPE) string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER) @@ -51,10 +51,10 @@ if (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)") check_c_compiler_flag("-Wp,-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE) if (WITH_FORTIFY_SOURCE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wp,-D_FORTIFY_SOURCE=2") - endif (WITH_FORTIFY_SOURCE) + endif () endif() endif() -endif (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)") +endif () if (UNIX AND NOT WIN32) # @@ -80,14 +80,14 @@ if (UNIX AND NOT WIN32) ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE ) - endif (CMAKE_SIZEOF_VOID_P MATCHES "8") + endif () if (_lfs_CFLAGS) string(REGEX REPLACE "[\r\n]" " " "${_lfs_CFLAGS}" "${${_lfs_CFLAGS}}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_lfs_CFLAGS}") - endif (_lfs_CFLAGS) + endif () else(UNIX AND NOT WIN32) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FILE_OFFSET_BITS=64") -endif (UNIX AND NOT WIN32) +endif () if (MSVC) # Use secure functions by default and suppress warnings about @@ -95,4 +95,4 @@ if (MSVC) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_NONSTDC_NO_WARNINGS=1 /D _CRT_SECURE_NO_WARNINGS=1") -endif (MSVC) +endif () diff --git a/cmake/modules/DefineInstallationPaths.cmake b/cmake/modules/DefineInstallationPaths.cmake index 592af77dbcbd1..b911c832188a3 100644 --- a/cmake/modules/DefineInstallationPaths.cmake +++ b/cmake/modules/DefineInstallationPaths.cmake @@ -95,7 +95,7 @@ if (UNIX) "${SHARE_INSTALL_PREFIX}/info" CACHE PATH "The ${APPLICATION_SHORTNAME} info install dir (default prefix/info)" ) -endif (UNIX) +endif () if (WIN32) # Same same @@ -110,4 +110,4 @@ if (WIN32) set(LOCALE_INSTALL_DIR "lang" CACHE PATH "-") set(SYSCONF_INSTALL_DIR "config" CACHE PATH "-") set(MAN_INSTALL_DIR "man" CACHE PATH "-") -endif (WIN32) +endif () diff --git a/cmake/modules/DefinePlatformDefaults.cmake b/cmake/modules/DefinePlatformDefaults.cmake index d1b65e1859c9e..5ac23f41c0977 100644 --- a/cmake/modules/DefinePlatformDefaults.cmake +++ b/cmake/modules/DefinePlatformDefaults.cmake @@ -8,27 +8,27 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux") set(LINUX TRUE) -endif(CMAKE_SYSTEM_NAME MATCHES "Linux") +endif() if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") set(FREEBSD TRUE) set(BSD TRUE) -endif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +endif () if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD") set(OPENBSD TRUE) set(BSD TRUE) -endif (CMAKE_SYSTEM_NAME MATCHES "OpenBSD") +endif () if (CMAKE_SYSTEM_NAME MATCHES "NetBSD") set(NETBSD TRUE) set(BSD TRUE) -endif (CMAKE_SYSTEM_NAME MATCHES "NetBSD") +endif () if (CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)") set(SOLARIS TRUE) -endif (CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)") +endif () if (CMAKE_SYSTEM_NAME MATCHES "OS2") set(OS2 TRUE) -endif (CMAKE_SYSTEM_NAME MATCHES "OS2") +endif () diff --git a/cmake/modules/FindCMocka.cmake b/cmake/modules/FindCMocka.cmake index c796a663c5c35..0677c110736ed 100644 --- a/cmake/modules/FindCMocka.cmake +++ b/cmake/modules/FindCMocka.cmake @@ -41,7 +41,7 @@ if (CMOCKA_LIBRARY) ${CMOCKA_LIBRARIES} ${CMOCKA_LIBRARY} ) -endif (CMOCKA_LIBRARY) +endif () include(FindPackageHandleStandardArgs) find_package_handle_standard_args(CMocka DEFAULT_MSG CMOCKA_LIBRARIES CMOCKA_INCLUDE_DIR) diff --git a/cmake/modules/FindLibSSH.cmake b/cmake/modules/FindLibSSH.cmake index 13186c92ace78..7a167d9de1514 100644 --- a/cmake/modules/FindLibSSH.cmake +++ b/cmake/modules/FindLibSSH.cmake @@ -46,7 +46,7 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUDE_DIRS) if (LIBSSH_INCLUDE_DIR AND SSH_LIBRARY) set(SSH_FOUND TRUE) - endif (LIBSSH_INCLUDE_DIR AND SSH_LIBRARY) + endif () set(LIBSSH_INCLUDE_DIRS ${LIBSSH_INCLUDE_DIR} @@ -78,9 +78,9 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUDE_DIRS) else (LIBSSH_VERSION_MAJOR) message(STATUS "LIBSSH_VERSION_MAJOR not found in ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h, assuming libssh is too old") set(LIBSSH_FOUND FALSE) - endif (LIBSSH_VERSION_MAJOR) - endif (LibSSH_FIND_VERSION) - endif (SSH_FOUND) + endif () + endif () + endif () # If the version is too old, but libs and includes are set, # find_package_handle_standard_args will set LIBSSH_FOUND to TRUE again, @@ -88,10 +88,10 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUDE_DIRS) if (LIBSSH_FOUND) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(LibSSH DEFAULT_MSG LIBSSH_LIBRARIES LIBSSH_INCLUDE_DIRS) - endif (LIBSSH_FOUND) + endif () # show the LIBSSH_INCLUDE_DIRS and LIBSSH_LIBRARIES variables only in the advanced view mark_as_advanced(LIBSSH_INCLUDE_DIRS LIBSSH_LIBRARIES) -endif (LIBSSH_LIBRARIES AND LIBSSH_INCLUDE_DIRS) +endif () diff --git a/cmake/modules/FindPackageVersionCheck.cmake b/cmake/modules/FindPackageVersionCheck.cmake index 7da7b8abad0aa..4a3c1c112c944 100644 --- a/cmake/modules/FindPackageVersionCheck.cmake +++ b/cmake/modules/FindPackageVersionCheck.cmake @@ -34,8 +34,8 @@ function(FIND_PACKAGE_VERSION_CHECK _NAME _FAIL_MSG) set(_AGE "new") else (${_NAME}_FIND_VERSION VERSION_LESS ${_NAME}_VERSION) set(_AGE "old") - endif (${_NAME}_FIND_VERSION VERSION_LESS ${_NAME}_VERSION) - endif (${_NAME}_FIND_VERSION VERSION_EQUAL ${_NAME}_VERSION) + endif () + endif () else (${_NAME}_FIND_VERSION_EXACT) if (${_NAME}_FIND_VERSION) if (${_NAME}_VERSION VERSION_LESS ${_NAME}_FIND_VERSION) @@ -43,19 +43,19 @@ function(FIND_PACKAGE_VERSION_CHECK _NAME _FAIL_MSG) set(_AGE "old") else (${_NAME}_VERSION VERSION_LESS ${_NAME}_FIND_VERSION) set(${_NAME_UPPER}_FOUND TRUE) - endif (${_NAME}_VERSION VERSION_LESS ${_NAME}_FIND_VERSION) - endif (${_NAME}_FIND_VERSION) - endif(${_NAME}_FIND_VERSION_EXACT) + endif () + endif () + endif() if ("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") if (${_NAME}_FIND_VERSION_EXACT) set(_FAIL_MESSAGE "The installed ${_NAME} version ${${_NAME}_VERSION} is too ${_AGE}, version ${${_NAME}_FIND_VERSION} is required.") else (${_NAME}_FIND_VERSION_EXACT) set(_FAIL_MESSAGE "The installed ${_NAME} version ${${_NAME}_VERSION} is too ${_AGE}, at least version ${${_NAME}_FIND_VERSION} is required.") - endif (${_NAME}_FIND_VERSION_EXACT) + endif () else ("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") set(_FAIL_MESSAGE "${_FAIL_MSG}") - endif ("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") + endif () if (NOT ${_NAME_UPPER}_FOUND) if (${_NAME}_FIND_REQUIRED) @@ -63,9 +63,9 @@ function(FIND_PACKAGE_VERSION_CHECK _NAME _FAIL_MSG) else (${_NAME}_FIND_REQUIRED) if (NOT ${_NAME}_FIND_QUIETLY) message(STATUS "${_FAIL_MESSAGE}") - endif (NOT ${_NAME}_FIND_QUIETLY) - endif (${_NAME}_FIND_REQUIRED) - endif (NOT ${_NAME_UPPER}_FOUND) + endif () + endif () + endif () set(${_NAME_UPPER}_FOUND ${${_NAME_UPPER}_FOUND} PARENT_SCOPE) -endfunction(FIND_PACKAGE_VERSION_CHECK) +endfunction() diff --git a/cmake/modules/FindSMBClient.cmake b/cmake/modules/FindSMBClient.cmake index 8ca9819b750f1..d464d3a14723a 100644 --- a/cmake/modules/FindSMBClient.cmake +++ b/cmake/modules/FindSMBClient.cmake @@ -22,7 +22,7 @@ else (SMBCLIENT_LIBRARIES AND SMBCLIENT_INCLUDE_DIRS) find_package(PkgConfig) if (PKG_CONFIG_FOUND) pkg_check_modules(_SMBCLIENT smbclient) - endif (PKG_CONFIG_FOUND) + endif () find_path(SMBCLIENT_INCLUDE_DIR NAMES @@ -55,7 +55,7 @@ else (SMBCLIENT_LIBRARIES AND SMBCLIENT_INCLUDE_DIRS) ${SMBCLIENT_LIBRARIES} ${SMBCLIENT_LIBRARY} ) - endif (SMBCLIENT_LIBRARY) + endif () include(FindPackageHandleStandardArgs) find_package_handle_standard_args(SMBClient DEFAULT_MSG SMBCLIENT_LIBRARIES SMBCLIENT_INCLUDE_DIRS) @@ -63,5 +63,5 @@ else (SMBCLIENT_LIBRARIES AND SMBCLIENT_INCLUDE_DIRS) # show the SMBCLIENT_INCLUDE_DIRS and SMBCLIENT_LIBRARIES variables only in the advanced view mark_as_advanced(SMBCLIENT_INCLUDE_DIRS SMBCLIENT_LIBRARIES) -endif (SMBCLIENT_LIBRARIES AND SMBCLIENT_INCLUDE_DIRS) +endif () diff --git a/cmake/modules/MacroAddCompileFlags.cmake b/cmake/modules/MacroAddCompileFlags.cmake index 0e2ffaa6a0b4d..26f8587b34889 100644 --- a/cmake/modules/MacroAddCompileFlags.cmake +++ b/cmake/modules/MacroAddCompileFlags.cmake @@ -15,8 +15,8 @@ macro (MACRO_ADD_COMPILE_FLAGS _target) set(_flags ${_flags} ${ARGN}) else (_flags) set(_flags ${ARGN}) - endif (_flags) + endif () set_target_properties(${_target} PROPERTIES COMPILE_FLAGS ${_flags}) -endmacro (MACRO_ADD_COMPILE_FLAGS) +endmacro () diff --git a/cmake/modules/MacroAddLinkFlags.cmake b/cmake/modules/MacroAddLinkFlags.cmake index 308d8e4d1f7f5..6b595016413a9 100644 --- a/cmake/modules/MacroAddLinkFlags.cmake +++ b/cmake/modules/MacroAddLinkFlags.cmake @@ -14,8 +14,8 @@ macro (MACRO_ADD_LINK_FLAGS _target) set(_flags "${_flags} ${ARGN}") else (_flags) set(_flags "${ARGN}") - endif (_flags) + endif () set_target_properties(${_target} PROPERTIES LINK_FLAGS "${_flags}") -endmacro (MACRO_ADD_LINK_FLAGS) +endmacro () diff --git a/cmake/modules/MacroEnsureOutOfSourceBuild.cmake b/cmake/modules/MacroEnsureOutOfSourceBuild.cmake index 30894df100048..dbc398064ddd6 100644 --- a/cmake/modules/MacroEnsureOutOfSourceBuild.cmake +++ b/cmake/modules/MacroEnsureOutOfSourceBuild.cmake @@ -13,6 +13,6 @@ macro (MACRO_ENSURE_OUT_OF_SOURCE_BUILD _errorMessage) if (_insource) message(SEND_ERROR "${_errorMessage}") message(FATAL_ERROR "Remove the file CMakeCache.txt in ${CMAKE_SOURCE_DIR} first.") - endif (_insource) + endif () -endmacro (MACRO_ENSURE_OUT_OF_SOURCE_BUILD) +endmacro () diff --git a/cmake/modules/MacroLogFeature.cmake b/cmake/modules/MacroLogFeature.cmake index 900007f4513cd..b56bac49715a6 100644 --- a/cmake/modules/MacroLogFeature.cmake +++ b/cmake/modules/MacroLogFeature.cmake @@ -36,23 +36,23 @@ IF (NOT _macroLogFeatureAlreadyIncluded) SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt) IF (EXISTS ${_file}) FILE(REMOVE ${_file}) - ENDIF (EXISTS ${_file}) + ENDIF () SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) IF (EXISTS ${_file}) FILE(REMOVE ${_file}) - ENDIF (EXISTS ${_file}) + ENDIF () SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) IF (EXISTS ${_file}) FILE(REMOVE ${_file}) - ENDIF (EXISTS ${_file}) + ENDIF () SET(_macroLogFeatureAlreadyIncluded TRUE) INCLUDE(FeatureSummary) -ENDIF (NOT _macroLogFeatureAlreadyIncluded) +ENDIF () MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _comments) @@ -68,43 +68,43 @@ MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _ SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/MissingRequirements.txt) ELSE ("${_required}" STREQUAL "TRUE") SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) - ENDIF ("${_required}" STREQUAL "TRUE") - ENDIF (${_var}) + ENDIF () + ENDIF () SET(_logtext " * ${_package}") IF (NOT ${_var}) IF (${_minvers} MATCHES ".*") SET(_logtext "${_logtext} (${_minvers} or higher)") - ENDIF (${_minvers} MATCHES ".*") + ENDIF () SET(_logtext "${_logtext} <${_url}>\n ") ELSE (NOT ${_var}) SET(_logtext "${_logtext} - ") - ENDIF (NOT ${_var}) + ENDIF () SET(_logtext "${_logtext}${_description}") IF (NOT ${_var}) IF (${_comments} MATCHES ".*") SET(_logtext "${_logtext}\n ${_comments}") - ENDIF (${_comments} MATCHES ".*") + ENDIF () # SET(_logtext "${_logtext}\n") #double-space missing features? - ENDIF (NOT ${_var}) + ENDIF () FILE(APPEND "${_LOGFILENAME}" "${_logtext}\n") IF(COMMAND SET_PACKAGE_INFO) # in FeatureSummary.cmake since CMake 2.8.3 SET_PACKAGE_INFO("${_package}" "\"${_description}\"" "${_url}" "\"${_comments}\"") - ENDIF(COMMAND SET_PACKAGE_INFO) + ENDIF() -ENDMACRO(MACRO_LOG_FEATURE) +ENDMACRO() MACRO(MACRO_DISPLAY_FEATURE_LOG) IF(COMMAND FEATURE_SUMMARY) # in FeatureSummary.cmake since CMake 2.8.3 FEATURE_SUMMARY(FILENAME ${CMAKE_CURRENT_BINARY_DIR}/FindPackageLog.txt WHAT ALL) - ENDIF(COMMAND FEATURE_SUMMARY) + ENDIF() SET(_missingFile ${CMAKE_BINARY_DIR}/MissingRequirements.txt) SET(_enabledFile ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) @@ -112,7 +112,7 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG) IF (EXISTS ${_missingFile} OR EXISTS ${_enabledFile} OR EXISTS ${_disabledFile}) SET(_printSummary TRUE) - ENDIF (EXISTS ${_missingFile} OR EXISTS ${_enabledFile} OR EXISTS ${_disabledFile}) + ENDIF () IF(_printSummary) SET(_missingDeps 0) @@ -120,7 +120,7 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG) FILE(READ ${_enabledFile} _enabled) FILE(REMOVE ${_enabledFile}) SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following external packages were located on your system.\n-- This installation will have the extra features provided by these packages.\n-----------------------------------------------------------------------------\n${_enabled}") - ENDIF (EXISTS ${_enabledFile}) + ENDIF () IF (EXISTS ${_disabledFile}) @@ -128,7 +128,7 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG) FILE(READ ${_disabledFile} _disabled) FILE(REMOVE ${_disabledFile}) SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following OPTIONAL packages could NOT be located on your system.\n-- Consider installing them to enable more features from this software.\n-----------------------------------------------------------------------------\n${_disabled}") - ENDIF (EXISTS ${_disabledFile}) + ENDIF () IF (EXISTS ${_missingFile}) @@ -137,12 +137,12 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG) SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system.\n-- You must install these packages before continuing.\n-----------------------------------------------------------------------------\n${_requirements}") FILE(REMOVE ${_missingFile}) SET(_haveMissingReq 1) - ENDIF (EXISTS ${_missingFile}) + ENDIF () IF (NOT ${_missingDeps}) SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- Congratulations! All external packages have been found.") - ENDIF (NOT ${_missingDeps}) + ENDIF () MESSAGE(${_summary}) @@ -151,8 +151,8 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG) IF(_haveMissingReq) MESSAGE(FATAL_ERROR "Exiting: Missing Requirements") - ENDIF(_haveMissingReq) + ENDIF() - ENDIF(_printSummary) + ENDIF() -ENDMACRO(MACRO_DISPLAY_FEATURE_LOG) +ENDMACRO() diff --git a/cmake/modules/MacroOptionalFindPackage.cmake b/cmake/modules/MacroOptionalFindPackage.cmake index 0718fb1d01574..1384a97821fc5 100644 --- a/cmake/modules/MacroOptionalFindPackage.cmake +++ b/cmake/modules/MacroOptionalFindPackage.cmake @@ -18,13 +18,13 @@ macro(_MOFP_SET_EMPTY_IF_DEFINED _name _var) if(DEFINED ${_name}_${_var}) set(${_name}_${_var} "") - endif(DEFINED ${_name}_${_var}) + endif() string(TOUPPER ${_name} _nameUpper) if(DEFINED ${_nameUpper}_${_var}) set(${_nameUpper}_${_var} "") - endif(DEFINED ${_nameUpper}_${_var}) -endmacro(_MOFP_SET_EMPTY_IF_DEFINED _package _var) + endif() +endmacro() macro (MACRO_OPTIONAL_FIND_PACKAGE _name ) @@ -44,5 +44,5 @@ macro (MACRO_OPTIONAL_FIND_PACKAGE _name ) _mofp_set_empty_if_defined(${_name} LIBS) _mofp_set_empty_if_defined(${_name} FLAGS) _mofp_set_empty_if_defined(${_name} DEFINITIONS) - endif (WITH_${_name}) -endmacro (MACRO_OPTIONAL_FIND_PACKAGE) + endif () +endmacro () diff --git a/cmake/modules/UseDoxygen.cmake b/cmake/modules/UseDoxygen.cmake index 02d35e2ae8615..435386df16e24 100644 --- a/cmake/modules/UseDoxygen.cmake +++ b/cmake/modules/UseDoxygen.cmake @@ -35,23 +35,23 @@ IF (DOXYGEN_FOUND) SET(DOXY_WARN_FORMAT "\"$file($line) : $text \"") ELSE (CMAKE_BUILD_TOOL MATCHES "(msdev|devenv)") SET(DOXY_WARN_FORMAT "\"$file:$line: $text \"") - ENDIF (CMAKE_BUILD_TOOL MATCHES "(msdev|devenv)") + ENDIF () # we need latex for doxygen because of the formulas FIND_PACKAGE(LATEX) IF (NOT LATEX_COMPILER) MESSAGE(STATUS "latex command LATEX_COMPILER not found but usually required. You will probably get warnings and user interaction on doxy run.") - ENDIF (NOT LATEX_COMPILER) + ENDIF () IF (NOT MAKEINDEX_COMPILER) MESSAGE(STATUS "makeindex command MAKEINDEX_COMPILER not found but usually required.") - ENDIF (NOT MAKEINDEX_COMPILER) + ENDIF () IF (NOT DVIPS_CONVERTER) MESSAGE(STATUS "dvips command DVIPS_CONVERTER not found but usually required.") - ENDIF (NOT DVIPS_CONVERTER) + ENDIF () FIND_PROGRAM(DOXYGEN_DOT_EXECUTABLE_PATH NAMES dot) IF (DOXYGEN_DOT_EXECUTABLE_PATH) SET(DOXYGEN_DOT_FOUND "YES") - ENDIF (DOXYGEN_DOT_EXECUTABLE_PATH) + ENDIF () IF (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/doxy.config.in") MESSAGE(STATUS "Generate ${CMAKE_CURRENT_BINARY_DIR}/doxy.config from doxy.config.in") @@ -76,10 +76,10 @@ IF (DOXYGEN_FOUND) ELSE (EXISTS "${CMAKE_MODULE_PATH}/doxy.config.in") # failed completely... MESSAGE(SEND_ERROR "Please create ${CMAKE_CURRENT_SOURCE_DIR}/doxy.config.in (or doxy.config as fallback)") - ENDIF(EXISTS "${CMAKE_MODULE_PATH}/doxy.config.in") + ENDIF() - ENDIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/doxy.config") - ENDIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/doxy.config.in") + ENDIF() + ENDIF() ADD_CUSTOM_TARGET(csync_doc ${DOXYGEN_EXECUTABLE} ${DOXY_CONFIG} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/doxy.config) @@ -105,16 +105,16 @@ IF (DOXYGEN_FOUND) SET(OUT "${PROJECT_NAME}") ELSE (PROJECT_NAME) SET(OUT "Documentation") # default - ENDIF(PROJECT_NAME) + ENDIF() IF (${PROJECT_NAME}_VERSION_MAJOR) SET(OUT "${OUT}-${${PROJECT_NAME}_VERSION_MAJOR}") IF (${PROJECT_NAME}_VERSION_MINOR) SET(OUT "${OUT}.${${PROJECT_NAME}_VERSION_MINOR}") IF (${PROJECT_NAME}_VERSION_PATCH) SET(OUT "${OUT}.${${PROJECT_NAME}_VERSION_PATCH}") - ENDIF(${PROJECT_NAME}_VERSION_PATCH) - ENDIF(${PROJECT_NAME}_VERSION_MINOR) - ENDIF(${PROJECT_NAME}_VERSION_MAJOR) + ENDIF() + ENDIF() + ENDIF() # keep suffix SET(OUT "${OUT}.chm") @@ -124,11 +124,11 @@ IF (DOXYGEN_FOUND) DESTINATION "doc" RENAME "${OUT}" ) - ENDIF(EXISTS "${PROJECT_BINARY_DIR}/doc/html/index.chm") - ENDIF(NOT TARGET_DOC_SKIP_INSTALL) + ENDIF() + ENDIF() - ENDIF(HTML_HELP_COMPILER) + ENDIF() # MESSAGE(SEND_ERROR "HTML_HELP_COMPILER=${HTML_HELP_COMPILER}") - ENDIF (WIN32) -ENDIF(DOXYGEN_FOUND) + ENDIF () +ENDIF() diff --git a/cmake/modules/Warnings.cmake b/cmake/modules/Warnings.cmake index 8bb5ea34513b6..3b5e64f5b3619 100644 --- a/cmake/modules/Warnings.cmake +++ b/cmake/modules/Warnings.cmake @@ -24,7 +24,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic") else(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") - endif(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8) + endif() else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") endif() diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt index 7875abf4116b7..4152a284a92d1 100644 --- a/shell_integration/libcloudproviders/CMakeLists.txt +++ b/shell_integration/libcloudproviders/CMakeLists.txt @@ -13,7 +13,7 @@ endif() configure_file(${_service_file} ${_target}) install(FILES ${_target} DESTINATION ${_install_dir} RENAME "${LIBCLOUDPROVIDERS_DBUS_BUS_NAME}.service") endforeach (_i ${ARGN}) -endmacro(dbus_add_activation_service _sources) +endmacro() macro(libcloudproviders_add_config _sources) set(_install_dir "${CMAKE_INSTALL_PREFIX}/share/cloud-providers") @@ -24,7 +24,7 @@ macro(libcloudproviders_add_config _sources) configure_file(${_service_file} ${_target}) install(FILES ${_target} DESTINATION ${_install_dir} RENAME "${LIBCLOUDPROVIDERS_DBUS_BUS_NAME}.ini") endforeach (_i ${ARGN}) -endmacro(libcloudproviders_add_config _sources) +endmacro() if (Qt6_FOUND) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c19ede88cee61..e2669c5e56c81 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -98,4 +98,4 @@ if (NOT BUILD_LIBRARIES_ONLY) if (BUILD_GUI) add_subdirectory(gui) endif() -endif(NOT BUILD_LIBRARIES_ONLY) +endif() diff --git a/src/csync/CMakeLists.txt b/src/csync/CMakeLists.txt index c8c7cde442c7c..5296b06a78f8f 100644 --- a/src/csync/CMakeLists.txt +++ b/src/csync/CMakeLists.txt @@ -27,7 +27,7 @@ include(../common/common.cmake) if (MEM_NULL_TESTS) add_definitions(-DCSYNC_MEM_NULL_TESTS) -endif (MEM_NULL_TESTS) +endif () # Specific option for builds tied to servers that do not support renaming extensions set(NO_RENAME_EXTENSION 0 CACHE BOOL "Do not issue rename if the extension changes") @@ -82,7 +82,7 @@ target_link_libraries(nextcloud_csync if(ZLIB_FOUND) target_link_libraries(nextcloud_csync PUBLIC ZLIB::ZLIB) -endif(ZLIB_FOUND) +endif() target_link_libraries(nextcloud_csync PRIVATE SQLite::SQLite3) diff --git a/src/csync/ConfigureChecks.cmake b/src/csync/ConfigureChecks.cmake index b4a6aead0beeb..d3259b19c51bd 100644 --- a/src/csync/ConfigureChecks.cmake +++ b/src/csync/ConfigureChecks.cmake @@ -31,7 +31,7 @@ if (NOT LINUX) if(HAVE_ARGP_H AND HAVE_LIBARGP) set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} argp) endif() -endif (NOT LINUX) +endif () if(WIN32) set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} psapi kernel32 Rstrtmgr) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index b3cdaf0f06808..cae07f9c9f1e6 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -633,7 +633,7 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE) string(REPLACE "${theme_dir}/colored/" "" _res ${_file}) string(REPLACE "-${APPLICATION_ICON_NAME}-icon.png" "" _res ${_res}) install(FILES ${_file} RENAME ${APPLICATION_ICON_NAME}.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/${_res}x${_res}/apps) - endforeach(_file) + endforeach() install(FILES ${client_I18N} DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPLICATION_EXECUTABLE}/i18n) else() file(GLOB_RECURSE VISUAL_ELEMENTS "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-w10startmenu*") @@ -710,7 +710,7 @@ if(TARGET PkgConfig::CLOUDPROVIDERS) string(REGEX REPLACE "[^A-z0-9]" "" DBUS_APPLICATION_NAME "${APPLICATION_SHORTNAME}") if(NOT DBUS_PREFIX) set(DBUS_PREFIX "com") - endif(NOT DBUS_PREFIX) + endif() set(LIBCLOUDPROVIDERS_DBUS_BUS_NAME "${DBUS_PREFIX}.${DBUS_VENDOR}.${DBUS_APPLICATION_NAME}") set(LIBCLOUDPROVIDERS_DBUS_OBJECT_PATH "/${DBUS_PREFIX}/${DBUS_VENDOR}/${DBUS_APPLICATION_NAME}") @@ -840,7 +840,7 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE AND NOT WIN32) find_package(SharedMimeInfo) if(SharedMimeInfo_FOUND) update_xdg_mimetypes( ${CMAKE_INSTALL_DATADIR}/mime/packages ) - endif(SharedMimeInfo_FOUND) + endif() endif() configure_file(configgui.h.in ${CMAKE_CURRENT_BINARY_DIR}/configgui.h) diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt index 9a1b7c6d846be..85b3363e03fed 100644 --- a/src/libsync/CMakeLists.txt +++ b/src/libsync/CMakeLists.txt @@ -217,7 +217,7 @@ IF (NOT APPLE) FILES ${creds_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/nextcloudsync/creds ) -ENDIF(NOT APPLE) +ENDIF() find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS WebSockets Xml Sql Gui Svg Widgets) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f30eba02090e3..9e8e80ec9d99f 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -158,7 +158,7 @@ endif() if( UNIX AND NOT APPLE ) nextcloud_add_test(InotifyWatcher) -endif(UNIX AND NOT APPLE) +endif() if (WIN32) include_directories( @@ -202,4 +202,4 @@ find_package(CMocka) if (CMOCKA_FOUND) include(AddCMockaTest) add_subdirectory(csync) -endif (CMOCKA_FOUND) +endif () From 0becd72d84c992b33d76bd648595e0aa19009b44 Mon Sep 17 00:00:00 2001 From: artyom-fedosov Date: Tue, 1 Sep 2026 14:31:44 +0300 Subject: [PATCH 2/4] fix(cmake): set CMAKE_CXX_STANDARD_REQUIRED to ON instead of 20 CMAKE_CXX_STANDARD_REQUIRED expects a boolean not a standard version number Signed-off-by: artyom-fedosov --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e7956e35f05cf..1debfa94672f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ if(APPLE) endif() set(CMAKE_CXX_STANDARD 20) -set(CMAKE_CXX_STANDARD_REQUIRED 20) +set(CMAKE_CXX_STANDARD_REQUIRED ON) include(FeatureSummary) From 057fefcba89a05c0c1b27e47bf40b5c81ea74dcf Mon Sep 17 00:00:00 2001 From: artyom-fedosov Date: Tue, 1 Sep 2026 14:42:08 +0300 Subject: [PATCH 3/4] chore(cmake): drop redundant CMP0071 policy setting cmake_minimum_required(VERSION 3.16) already implies NEW behavior for CMP0071 Signed-off-by: artyom-fedosov --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1debfa94672f3..46e01430b746e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,6 @@ # SPDX-FileCopyrightText: 2011 ownCloud GmbH # SPDX-License-Identifier: GPL-2.0-or-later cmake_minimum_required(VERSION 3.16) -cmake_policy(SET CMP0071 NEW) # Enable use of QtQuick compiler/generated code project(client) From 5ef182ca1e41ab897cec85099d6c1447d3e4dda9 Mon Sep 17 00:00:00 2001 From: artyom-fedosov Date: Tue, 1 Sep 2026 14:43:31 +0300 Subject: [PATCH 4/4] fix(cmake): remove duplicate COMPONENTS keyword in find_package Signed-off-by: artyom-fedosov --- shell_integration/libcloudproviders/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt index 4152a284a92d1..bfcbc3036726f 100644 --- a/shell_integration/libcloudproviders/CMakeLists.txt +++ b/shell_integration/libcloudproviders/CMakeLists.txt @@ -28,7 +28,7 @@ endmacro() if (Qt6_FOUND) - find_package(Qt6 COMPONENTS COMPONENTS DBus) + find_package(Qt6 COMPONENTS DBus) else() set(REQUIRED_QT_VERSION "5.15.0") find_package(Qt5 ${REQUIRED_QT_VERSION} COMPONENTS DBus)