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 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 modules/FindKDEWin.cmake (limited to 'modules/FindKDEWin.cmake') 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) -- cgit v1.2.1 From e8e499b81748508ea167e0aa50f69bcb199ba650 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Tue, 7 Jul 2009 14:55:50 +0000 Subject: KDEWIN_INCLUDES and KDEWIN_LIBRARIES need to be set always, not only for the first time svn path=/trunk/KDE/kdelibs/; revision=992670 --- modules/FindKDEWin.cmake | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'modules/FindKDEWin.cmake') diff --git a/modules/FindKDEWin.cmake b/modules/FindKDEWin.cmake index 354ecb91..f034b738 100644 --- a/modules/FindKDEWin.cmake +++ b/modules/FindKDEWin.cmake @@ -14,7 +14,7 @@ if (WIN32) - if (NOT KDEWIN_LIBRARIES) + if (NOT KDEWIN_LIBRARY) find_path(KDEWIN_INCLUDE_DIR kdewin_export.h ${CMAKE_INCLUDE_PATH} @@ -26,9 +26,12 @@ if (WIN32) if (CMAKE_BUILD_TYPE STREQUAL "Debug") set (LIBRARY_NAME kdewind) - else (CMAKE_BUILD_TYPE STREQUAL "Debug") + else(CMAKE_BUILD_TYPE STREQUAL "Debug") set (LIBRARY_NAME kdewin) endif (CMAKE_BUILD_TYPE STREQUAL "Debug") + if (MSVC_IDE ) + set (LIBRARY_NAME "kdewind") + endif (MSVC_IDE) find_library(KDEWIN_LIBRARY NAMES ${LIBRARY_NAME} @@ -37,28 +40,27 @@ if (WIN32) ${CMAKE_INSTALL_PREFIX}/lib NO_SYSTEM_ENVIRONMENT_PATH ) + endif (NOT KDEWIN_LIBRARY) - 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}) + 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) - endif (NOT KDEWIN_LIBRARIES) + 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}) if (KDEWIN_FOUND) if (NOT KDEWIN_FIND_QUIETLY) -- cgit v1.2.1 From 00a6480f957d06b8679c1e62cded97402fb10e50 Mon Sep 17 00:00:00 2001 From: Romain Pokrzywka Date: Tue, 14 Jul 2009 12:50:30 +0000 Subject: arf, this little bugger took me two hours to find :-o svn path=/trunk/KDE/kdelibs/; revision=996456 --- modules/FindKDEWin.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'modules/FindKDEWin.cmake') diff --git a/modules/FindKDEWin.cmake b/modules/FindKDEWin.cmake index f034b738..469ba3dc 100644 --- a/modules/FindKDEWin.cmake +++ b/modules/FindKDEWin.cmake @@ -63,13 +63,13 @@ if (WIN32) set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${KDEWIN_LIBRARIES}) if (KDEWIN_FOUND) - if (NOT KDEWIN_FIND_QUIETLY) - message(STATUS "Found KDEWIN library: ${KDEWIN_LIBRARY}") - endif (NOT KDEWIN_FIND_QUIETLY) + 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) + 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) -- cgit v1.2.1 From b4ba1600ca61259417da8571b14d0d924f0fe862 Mon Sep 17 00:00:00 2001 From: Romain Pokrzywka Date: Tue, 14 Jul 2009 13:14:04 +0000 Subject: add the standard KDE paths to the include/lib search paths, useful when KDE is built with emerge svn path=/trunk/KDE/kdelibs/; revision=996461 --- modules/FindKDEWin.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'modules/FindKDEWin.cmake') diff --git a/modules/FindKDEWin.cmake b/modules/FindKDEWin.cmake index 469ba3dc..2da5384e 100644 --- a/modules/FindKDEWin.cmake +++ b/modules/FindKDEWin.cmake @@ -17,6 +17,7 @@ if (WIN32) if (NOT KDEWIN_LIBRARY) find_path(KDEWIN_INCLUDE_DIR kdewin_export.h + ${KDE4_INCLUDE_DIR} ${CMAKE_INCLUDE_PATH} ${CMAKE_INSTALL_PREFIX}/include ) @@ -36,6 +37,7 @@ if (WIN32) find_library(KDEWIN_LIBRARY NAMES ${LIBRARY_NAME} PATHS + ${KDE4_LIB_DIR} ${_cmakeLibraryPathCmakeStyle} ${CMAKE_INSTALL_PREFIX}/lib NO_SYSTEM_ENVIRONMENT_PATH -- cgit v1.2.1 From 6f3e9e9fb2fce5412ef5e4b710f52d965e20d337 Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 19 Aug 2009 08:57:47 +0000 Subject: aclemens asked whether CMAKE_BUILD_TYPE was case sensitive; it's not, except for those two buggy checks - fixed. svn path=/trunk/KDE/kdelibs/; revision=1013192 --- modules/FindKDEWin.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'modules/FindKDEWin.cmake') diff --git a/modules/FindKDEWin.cmake b/modules/FindKDEWin.cmake index 2da5384e..2c420b55 100644 --- a/modules/FindKDEWin.cmake +++ b/modules/FindKDEWin.cmake @@ -25,11 +25,12 @@ if (WIN32) # 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") + string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) + if (CMAKE_BUILD_TYPE_TOLOWER STREQUAL "debug") set (LIBRARY_NAME kdewind) - else(CMAKE_BUILD_TYPE STREQUAL "Debug") + else(CMAKE_BUILD_TYPE_TOLOWER STREQUAL "debug") set (LIBRARY_NAME kdewin) - endif (CMAKE_BUILD_TYPE STREQUAL "Debug") + endif (CMAKE_BUILD_TYPE_TOLOWER STREQUAL "debug") if (MSVC_IDE ) set (LIBRARY_NAME "kdewind") endif (MSVC_IDE) -- cgit v1.2.1 From 5baf063f23862551ee974322df7a6d63b4dd221e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20Staniek?= Date: Wed, 23 Sep 2009 13:20:36 +0000 Subject: use MATCHES to cover more debug targets svn path=/trunk/KDE/kdelibs/; revision=1027172 --- modules/FindKDEWin.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/FindKDEWin.cmake') diff --git a/modules/FindKDEWin.cmake b/modules/FindKDEWin.cmake index 2c420b55..8975981a 100644 --- a/modules/FindKDEWin.cmake +++ b/modules/FindKDEWin.cmake @@ -26,11 +26,11 @@ if (WIN32) FILE(TO_CMAKE_PATH "${CMAKE_LIBRARY_PATH}" _cmakeLibraryPathCmakeStyle) string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) - if (CMAKE_BUILD_TYPE_TOLOWER STREQUAL "debug") + if (CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) set (LIBRARY_NAME kdewind) - else(CMAKE_BUILD_TYPE_TOLOWER STREQUAL "debug") + else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) set (LIBRARY_NAME kdewin) - endif (CMAKE_BUILD_TYPE_TOLOWER STREQUAL "debug") + endif (CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) if (MSVC_IDE ) set (LIBRARY_NAME "kdewind") endif (MSVC_IDE) -- cgit v1.2.1 From 687c479c154dfb6300f2338a3f358f4ba79d37bd Mon Sep 17 00:00:00 2001 From: Carlo Segato Date: Sat, 17 Oct 2009 23:03:34 +0000 Subject: fix cmake error if CMAKE_BUILD_TYPE isn't set svn path=/trunk/KDE/kdelibs/; revision=1036856 --- modules/FindKDEWin.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindKDEWin.cmake') diff --git a/modules/FindKDEWin.cmake b/modules/FindKDEWin.cmake index 8975981a..ee2983c4 100644 --- a/modules/FindKDEWin.cmake +++ b/modules/FindKDEWin.cmake @@ -25,7 +25,7 @@ if (WIN32) # search for kdewin in the default install directory for applications (default of (n)make install) FILE(TO_CMAKE_PATH "${CMAKE_LIBRARY_PATH}" _cmakeLibraryPathCmakeStyle) - string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) + string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_TOLOWER) if (CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) set (LIBRARY_NAME kdewind) else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) -- cgit v1.2.1 From 41d23fc4e6ce5eefdae075804fe27c7c0bf2bb0d Mon Sep 17 00:00:00 2001 From: Nick Shaforostoff Date: Mon, 5 Jul 2010 20:49:28 +0000 Subject: KDE on windows: revert the part of 992670 commit that is not explained in the commit message. it broke release mode for visual studio (unconditionally setting kdewind as a library for linking) CCMAIL: Ralf.Habacker@saght.tessag.com svn path=/trunk/KDE/kdelibs/; revision=1146382 --- modules/FindKDEWin.cmake | 3 --- 1 file changed, 3 deletions(-) (limited to 'modules/FindKDEWin.cmake') diff --git a/modules/FindKDEWin.cmake b/modules/FindKDEWin.cmake index ee2983c4..9388713c 100644 --- a/modules/FindKDEWin.cmake +++ b/modules/FindKDEWin.cmake @@ -31,9 +31,6 @@ if (WIN32) else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) set (LIBRARY_NAME kdewin) endif (CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - if (MSVC_IDE ) - set (LIBRARY_NAME "kdewind") - endif (MSVC_IDE) find_library(KDEWIN_LIBRARY NAMES ${LIBRARY_NAME} -- cgit v1.2.1 From bc451d8de618decb1ddd20ca1539ca0b8a08fc87 Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Mon, 12 Jul 2010 13:39:10 +0000 Subject: - made kdelibs compile for wince - disabled some functionality for wince - changed some stuff to unicode functions svn path=/trunk/KDE/kdelibs/; revision=1149056 --- modules/FindKDEWin.cmake | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'modules/FindKDEWin.cmake') diff --git a/modules/FindKDEWin.cmake b/modules/FindKDEWin.cmake index 9388713c..87076767 100644 --- a/modules/FindKDEWin.cmake +++ b/modules/FindKDEWin.cmake @@ -45,7 +45,11 @@ if (WIN32) 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(NOT WINCE) + set(KDEWIN_LIBRARIES ${KDEWIN_LIBRARY} user32 shell32 ws2_32 netapi32 userenv) + else(NOT WINCE) + set(KDEWIN_LIBRARIES ${KDEWIN_LIBRARY} ws2 ) + endif(NOT WINCE) if (MINGW) #mingw compiler @@ -54,7 +58,11 @@ if (WIN32) # 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}) + if (WINCE) + set(KDEWIN_INCLUDES ${KDEWIN_INCLUDE_DIR} ${KDEWIN_INCLUDE_DIR}/msvc ${WCECOMPAT_INCLUDE_DIR} ${QT_INCLUDES} ${MSSDK_DIR}) + else(WINCE) + set(KDEWIN_INCLUDES ${KDEWIN_INCLUDE_DIR} ${KDEWIN_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${MSSDK_DIR}) + endif(WINCE) endif (MINGW) endif (KDEWIN_LIBRARY AND KDEWIN_INCLUDE_DIR) -- cgit v1.2.1 From 90db91b07d78008629b210b69109e636ed8df209 Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Tue, 13 Jul 2010 15:01:26 +0000 Subject: - added wcecompat as dependency of kdewin so that if kdewin is linked wcecompat is also linked svn path=/trunk/KDE/kdelibs/; revision=1149495 --- modules/FindKDEWin.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'modules/FindKDEWin.cmake') diff --git a/modules/FindKDEWin.cmake b/modules/FindKDEWin.cmake index 87076767..f9b7bf00 100644 --- a/modules/FindKDEWin.cmake +++ b/modules/FindKDEWin.cmake @@ -14,7 +14,13 @@ if (WIN32) + + if(WINCE) + FIND_PACKAGE(WCECOMPAT REQUIRED) + endif(WINCE) + if (NOT KDEWIN_LIBRARY) + find_path(KDEWIN_INCLUDE_DIR kdewin_export.h ${KDE4_INCLUDE_DIR} @@ -48,7 +54,7 @@ if (WIN32) if(NOT WINCE) set(KDEWIN_LIBRARIES ${KDEWIN_LIBRARY} user32 shell32 ws2_32 netapi32 userenv) else(NOT WINCE) - set(KDEWIN_LIBRARIES ${KDEWIN_LIBRARY} ws2 ) + set(KDEWIN_LIBRARIES ${KDEWIN_LIBRARY} ws2 ${WCECOMPAT_LIBRARIES}) endif(NOT WINCE) if (MINGW) -- cgit v1.2.1