diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2009-05-26 11:20:38 +0000 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2009-05-26 11:20:38 +0000 |
| commit | cfa2b7678a59d2fba8b569bb2cf2aa842cdef6d7 (patch) | |
| tree | 4b951d5d6ab4e6b2e190a55e97f92b16eb449967 | |
| parent | 820fd6937b0732ee3bd4a87c0f9b5c9e5a4262c0 (diff) | |
| download | extra-cmake-modules-cfa2b7678a59d2fba8b569bb2cf2aa842cdef6d7.tar.gz extra-cmake-modules-cfa2b7678a59d2fba8b569bb2cf2aa842cdef6d7.tar.bz2 | |
fixed initialisation of uac manifest support for non kdelibs packages
svn path=/trunk/KDE/kdelibs/; revision=973045
| -rw-r--r-- | modules/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 20 |
2 files changed, 18 insertions, 20 deletions
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 7d61821e..0d17be16 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -1,21 +1,3 @@ -if (WIN32) - OPTION(KDE4_ENABLE_UAC_MANIFEST "add manifest to make vista uac happy" OFF) - if (KDE4_ENABLE_UAC_MANIFEST) - if (NOT MT_EXECUTABLE) - find_program(MT_EXECUTABLE mt - PATHS ${KDEWIN32_INCLUDE_DIR}/../bin - NO_DEFAULT_PATH - ) - endif (NOT MT_EXECUTABLE) - if (MT_EXECUTABLE) - message(STATUS "Found KDE manifest tool at ${MT_EXECUTABLE} ") - else (MT_EXECUTABLE) - message(STATUS "KDE manifest tool not found, manifest generating for Windows Vista disabled") - set (KDE4_ENABLE_UAC_MANIFEST OFF) - endif (MT_EXECUTABLE) - endif (KDE4_ENABLE_UAC_MANIFEST) -endif (WIN32) - ## install the cmake files file(GLOB cmakeFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.cmake") diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index b5a9bb5a..a9997dfa 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -582,6 +582,24 @@ endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSI # info from "http://www.linuxfromscratch.org/hlfs/view/unstable/glibc/chapter02/pie.html" option(KDE4_ENABLE_FPIE "Enable platform supports PIE linking") +if (WIN32) + find_package(KDEWIN32 REQUIRED) + OPTION(KDE4_ENABLE_UAC_MANIFEST "add manifest to make vista uac happy" OFF) + if (KDE4_ENABLE_UAC_MANIFEST) + if (NOT MT_EXECUTABLE) + find_program(MT_EXECUTABLE mt + PATHS ${KDEWIN32_INCLUDE_DIR}/../bin + NO_DEFAULT_PATH + ) + endif (NOT MT_EXECUTABLE) + if (MT_EXECUTABLE) + message(STATUS "Found KDE manifest tool at ${MT_EXECUTABLE} ") + else (MT_EXECUTABLE) + message(STATUS "KDE manifest tool not found, manifest generating for Windows Vista disabled") + set (KDE4_ENABLE_UAC_MANIFEST OFF) + endif (MT_EXECUTABLE) + endif (KDE4_ENABLE_UAC_MANIFEST) +endif (WIN32) ##################### some more settings ########################################## @@ -794,8 +812,6 @@ if (WIN32) message(FATAL_ERROR "Cygwin is NOT supported, use mingw or MSVC to build KDE4.") endif(CYGWIN) - find_package(KDEWIN32 REQUIRED) - # limit win32 packaging to kdelibs at now # don't know if package name, version and notes are always available if(_kdeBootStrapping) |