From 852c577c89a7195b94545a53b40406f1034baf3c Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Wed, 17 Jun 2009 08:02:55 +0000 Subject: followed other module naming scheme svn path=/trunk/KDE/kdelibs/; revision=982916 --- modules/FindKDEWIN.cmake | 73 ---------------------------------------------- modules/FindKDEWIN32.cmake | 26 ----------------- modules/FindKDEWin.cmake | 73 ++++++++++++++++++++++++++++++++++++++++++++++ modules/FindKDEWin32.cmake | 26 +++++++++++++++++ 4 files changed, 99 insertions(+), 99 deletions(-) delete mode 100644 modules/FindKDEWIN.cmake delete mode 100644 modules/FindKDEWIN32.cmake create mode 100644 modules/FindKDEWin.cmake create mode 100644 modules/FindKDEWin32.cmake (limited to 'modules') diff --git a/modules/FindKDEWIN.cmake b/modules/FindKDEWIN.cmake deleted file mode 100644 index 354ecb91..00000000 --- a/modules/FindKDEWIN.cmake +++ /dev/null @@ -1,73 +0,0 @@ -# - Try to find the KDEWIN library -# -# Once done this will define -# -# KDEWIN_FOUND - system has KDEWIN -# KDEWIN_INCLUDES - the KDEWIN include directories -# KDEWIN_LIBRARIES - The libraries needed to use KDEWIN - -# Copyright (c) 2006, Alexander Neundorf, -# Copyright (c) 2007-2009, Ralf Habacker, -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - - -if (WIN32) - if (NOT KDEWIN_LIBRARIES) - - find_path(KDEWIN_INCLUDE_DIR kdewin_export.h - ${CMAKE_INCLUDE_PATH} - ${CMAKE_INSTALL_PREFIX}/include - ) - - # search for kdewin in the default install directory for applications (default of (n)make install) - FILE(TO_CMAKE_PATH "${CMAKE_LIBRARY_PATH}" _cmakeLibraryPathCmakeStyle) - - if (CMAKE_BUILD_TYPE STREQUAL "Debug") - set (LIBRARY_NAME kdewind) - else (CMAKE_BUILD_TYPE STREQUAL "Debug") - set (LIBRARY_NAME kdewin) - endif (CMAKE_BUILD_TYPE STREQUAL "Debug") - - find_library(KDEWIN_LIBRARY - NAMES ${LIBRARY_NAME} - PATHS - ${_cmakeLibraryPathCmakeStyle} - ${CMAKE_INSTALL_PREFIX}/lib - NO_SYSTEM_ENVIRONMENT_PATH - ) - - if (KDEWIN_LIBRARY AND KDEWIN_INCLUDE_DIR) - set(KDEWIN_FOUND TRUE) - # add needed system libs - set(KDEWIN_LIBRARIES ${KDEWIN_LIBRARY} user32 shell32 ws2_32 netapi32 userenv) - - if (MINGW) - #mingw compiler - set(KDEWIN_INCLUDES ${KDEWIN_INCLUDE_DIR} ${KDEWIN_INCLUDE_DIR}/mingw ${QT_INCLUDES}) - else (MINGW) - # msvc compiler - # add the MS SDK include directory if available - file(TO_CMAKE_PATH "$ENV{MSSDK}" MSSDK_DIR) - set(KDEWIN_INCLUDES ${KDEWIN_INCLUDE_DIR} ${KDEWIN_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${MSSDK_DIR}) - endif (MINGW) - - endif (KDEWIN_LIBRARY AND KDEWIN_INCLUDE_DIR) - # required for configure - set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${KDEWIN_INCLUDES}) - set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${KDEWIN_LIBRARIES}) - - endif (NOT KDEWIN_LIBRARIES) - - if (KDEWIN_FOUND) - if (NOT KDEWIN_FIND_QUIETLY) - message(STATUS "Found KDEWIN library: ${KDEWIN_LIBRARY}") - endif (NOT KDEWIN_FIND_QUIETLY) - - else (KDEWIN_FOUND) - if (KDEWIN_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find KDEWIN library\nPlease install it first") - endif (KDEWIN_FIND_REQUIRED) - endif (KDEWIN_FOUND) -endif (WIN32) diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake deleted file mode 100644 index 1f78055b..00000000 --- a/modules/FindKDEWIN32.cmake +++ /dev/null @@ -1,26 +0,0 @@ -# - Try to find the KDEWIN32 library -# - Try to find the KDEWIN32 library - deprecated -# -# Once done this will define -# -# KDEWIN32_FOUND - system has KDEWIN32 -# KDEWIN32_INCLUDES - the KDEWIN32 include directories -# KDEWIN32_LIBRARIES - The libraries needed to use KDEWIN32 - -# Copyright (c) 2006, Alexander Neundorf, -# Copyright (c) 2007-2009, Ralf Habacker, -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - - -if (WIN32) - message(STATUS "The kdewin32 cmake module is deprecated, use kdewin instead") - find_package(KDEWIN) - - if (KDEWIN_FOUND) - set(KDEWIN32_FOUND ${KDEWIN_FOUND}) - set(KDEWIN32_INCLUDES ${KDEWIN_INCLUDES}) - set(KDEWIN32_LIBRARIES ${KDEWIN_LIBRARIES}) - endif (KDEWIN_FOUND) -endif (WIN32) diff --git a/modules/FindKDEWin.cmake b/modules/FindKDEWin.cmake new file mode 100644 index 00000000..354ecb91 --- /dev/null +++ b/modules/FindKDEWin.cmake @@ -0,0 +1,73 @@ +# - Try to find the KDEWIN library +# +# Once done this will define +# +# KDEWIN_FOUND - system has KDEWIN +# KDEWIN_INCLUDES - the KDEWIN include directories +# KDEWIN_LIBRARIES - The libraries needed to use KDEWIN + +# Copyright (c) 2006, Alexander Neundorf, +# Copyright (c) 2007-2009, Ralf Habacker, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +if (WIN32) + if (NOT KDEWIN_LIBRARIES) + + find_path(KDEWIN_INCLUDE_DIR kdewin_export.h + ${CMAKE_INCLUDE_PATH} + ${CMAKE_INSTALL_PREFIX}/include + ) + + # search for kdewin in the default install directory for applications (default of (n)make install) + FILE(TO_CMAKE_PATH "${CMAKE_LIBRARY_PATH}" _cmakeLibraryPathCmakeStyle) + + if (CMAKE_BUILD_TYPE STREQUAL "Debug") + set (LIBRARY_NAME kdewind) + else (CMAKE_BUILD_TYPE STREQUAL "Debug") + set (LIBRARY_NAME kdewin) + endif (CMAKE_BUILD_TYPE STREQUAL "Debug") + + find_library(KDEWIN_LIBRARY + NAMES ${LIBRARY_NAME} + PATHS + ${_cmakeLibraryPathCmakeStyle} + ${CMAKE_INSTALL_PREFIX}/lib + NO_SYSTEM_ENVIRONMENT_PATH + ) + + if (KDEWIN_LIBRARY AND KDEWIN_INCLUDE_DIR) + set(KDEWIN_FOUND TRUE) + # add needed system libs + set(KDEWIN_LIBRARIES ${KDEWIN_LIBRARY} user32 shell32 ws2_32 netapi32 userenv) + + if (MINGW) + #mingw compiler + set(KDEWIN_INCLUDES ${KDEWIN_INCLUDE_DIR} ${KDEWIN_INCLUDE_DIR}/mingw ${QT_INCLUDES}) + else (MINGW) + # msvc compiler + # add the MS SDK include directory if available + file(TO_CMAKE_PATH "$ENV{MSSDK}" MSSDK_DIR) + set(KDEWIN_INCLUDES ${KDEWIN_INCLUDE_DIR} ${KDEWIN_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${MSSDK_DIR}) + endif (MINGW) + + endif (KDEWIN_LIBRARY AND KDEWIN_INCLUDE_DIR) + # required for configure + set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${KDEWIN_INCLUDES}) + set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${KDEWIN_LIBRARIES}) + + endif (NOT KDEWIN_LIBRARIES) + + if (KDEWIN_FOUND) + if (NOT KDEWIN_FIND_QUIETLY) + message(STATUS "Found KDEWIN library: ${KDEWIN_LIBRARY}") + endif (NOT KDEWIN_FIND_QUIETLY) + + else (KDEWIN_FOUND) + if (KDEWIN_FIND_REQUIRED) + message(FATAL_ERROR "Could NOT find KDEWIN library\nPlease install it first") + endif (KDEWIN_FIND_REQUIRED) + endif (KDEWIN_FOUND) +endif (WIN32) diff --git a/modules/FindKDEWin32.cmake b/modules/FindKDEWin32.cmake new file mode 100644 index 00000000..1f78055b --- /dev/null +++ b/modules/FindKDEWin32.cmake @@ -0,0 +1,26 @@ +# - Try to find the KDEWIN32 library +# - Try to find the KDEWIN32 library - deprecated +# +# Once done this will define +# +# KDEWIN32_FOUND - system has KDEWIN32 +# KDEWIN32_INCLUDES - the KDEWIN32 include directories +# KDEWIN32_LIBRARIES - The libraries needed to use KDEWIN32 + +# Copyright (c) 2006, Alexander Neundorf, +# Copyright (c) 2007-2009, Ralf Habacker, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +if (WIN32) + message(STATUS "The kdewin32 cmake module is deprecated, use kdewin instead") + find_package(KDEWIN) + + if (KDEWIN_FOUND) + set(KDEWIN32_FOUND ${KDEWIN_FOUND}) + set(KDEWIN32_INCLUDES ${KDEWIN_INCLUDES}) + set(KDEWIN32_LIBRARIES ${KDEWIN_LIBRARIES}) + endif (KDEWIN_FOUND) +endif (WIN32) -- cgit v1.2.1