aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2008-12-04 13:13:40 +0000
committerRalf Habacker <ralf.habacker@freenet.de>2008-12-04 13:13:40 +0000
commite34ca7a9480b9dd714cec2f8a0e58c1f731bf25a (patch)
treed62cf8a0f5378c5f8e0b19246b8a64a0216d93a1
parent4c183f990df8a96627f057224d73349061e74909 (diff)
downloadextra-cmake-modules-e34ca7a9480b9dd714cec2f8a0e58c1f731bf25a.tar.gz
extra-cmake-modules-e34ca7a9480b9dd714cec2f8a0e58c1f731bf25a.tar.bz2
removed references to the obsolate KDEWIN package
svn path=/trunk/KDE/kdelibs/; revision=892482
-rw-r--r--modules/FindKDEWIN32.cmake3
-rw-r--r--modules/FindKDEWIN_Packager.cmake8
2 files changed, 2 insertions, 9 deletions
diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake
index d22a85a7..abbff19e 100644
--- a/modules/FindKDEWIN32.cmake
+++ b/modules/FindKDEWIN32.cmake
@@ -15,9 +15,6 @@
if (WIN32)
if (NOT KDEWIN32_DIR)
- if(NOT KDEWIN_FOUND)
- find_package(KDEWIN)
- endif(NOT KDEWIN_FOUND)
find_path(KDEWIN32_INCLUDE_DIR winposix_export.h
${CMAKE_INCLUDE_PATH}
diff --git a/modules/FindKDEWIN_Packager.cmake b/modules/FindKDEWIN_Packager.cmake
index c19f4115..b8f023e5 100644
--- a/modules/FindKDEWIN_Packager.cmake
+++ b/modules/FindKDEWIN_Packager.cmake
@@ -1,5 +1,5 @@
#
-# KDEWIN packager support http://download.cegit.de/kde-windows/installer
+# KDEWIN packager http://www.winkde.org/pub/kde/ports/win32/installer
#
# The kdewin packager is searched in the following pathes and order
#
@@ -51,16 +51,12 @@ if (WIN32)
endif(NOT KDEWIN_PACKAGER_DIR)
endif(NOT KDEWIN_PACKAGER_DIR)
- # added FindKDEWIN.cmake support
- if (NOT KDEWIN_PACKAGER_DIR AND KDEWIN_DIR)
- set (KDEWIN_PACKAGER_DIR ${KDEWIN_DIR})
- endif (NOT KDEWIN_PACKAGER_DIR AND KDEWIN_DIR)
-
if (KDEWIN_PACKAGER_DIR)
find_program(KDEWIN_PACKAGER_EXECUTABLE kdewin-packager
PATHS
${KDEWIN_PACKAGER_DIR}/bin
+ ${CMAKE_INSTALL_PREFIX}/bin
)
set(KDEWIN_PACKAGER_FOUND TRUE)