From 5e23bc604c0587c0e8d090ea028403e18023d3a0 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Tue, 7 Jan 2014 22:05:37 +0000 Subject: Remove commented-out manifest tool code from KDECompilerSettings This originally found the manifest tool from kdewin, which was then used by kde4_add_executable to embed a standard manifest file in applications, apparently allowing applications to have administrator privileges when run by an administrator. Given we do not have kde4_add_executable any more, this is useless (and certainly does not belong in this file). kdewin should provide any relevant manifest macros itself, in a KDEWinMacros.cmake file or some such, and these should be used on an as-needed basis for executables that require it. --- kde-modules/KDECompilerSettings.cmake | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake index cd93e519..5978fbe8 100644 --- a/kde-modules/KDECompilerSettings.cmake +++ b/kde-modules/KDECompilerSettings.cmake @@ -11,34 +11,6 @@ include(CheckCXXCompilerFlag) -# TODO: what's up with this manifest stuff ? -# setting the CMAKE_MODULE_PATH like this is definitely wrong. -# FindKDEWin.cmake should probably come from ecm -# -# if (WIN32) -# list(APPEND CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/share/apps/cmake/modules") -# find_package(KDEWin REQUIRED) -# option(KDE4_ENABLE_UAC_MANIFEST "add manifest to make vista uac happy" OFF) -# if (KDE4_ENABLE_UAC_MANIFEST) -# find_program(KDE4_MT_EXECUTABLE mt -# PATHS ${KDEWIN_INCLUDE_DIR}/../bin -# NO_DEFAULT_PATH -# ) -# if (KDE4_MT_EXECUTABLE) -# message(STATUS "Found KDE manifest tool at ${KDE4_MT_EXECUTABLE} ") -# else (KDE4_MT_EXECUTABLE) -# message(STATUS "KDE manifest tool not found, manifest generating for Windows Vista disabled") -# set (KDE4_ENABLE_UAC_MANIFEST OFF) -# endif (KDE4_MT_EXECUTABLE) -# endif (KDE4_ENABLE_UAC_MANIFEST) -# endif (WIN32) - - -###################################################### -# and now the platform specific stuff -###################################################### - - if (WIN32) # limit win32 packaging to kdelibs at now -- cgit v1.2.1