From 75a07dd38b4a491a9d16d24492bea5c6ba90a8ff Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 12 Feb 2006 14:38:04 +0000 Subject: -moved the cmake code to find kdewin32 out of FindKDE4.cmake and into its own FindKDEWIN32.cmake file -added a new FindGNUWIN32.cmake file, which tries to find the gnuwin32 base directory -changed all "FOO_LIBRARY" variable names to "FOO_LIBRARIES" to be more consistent with the other cmake modules -added a macro_getenv_win_path() which replaces all backslahes with slashes from environment variables -modified the kde4_add_kcfg_files() command, so that the generated header is also processed by moc -all tests compile and link Alex CCMAIL:kde-buildsystem@kde.org The changes to the windows stuff are untested, since I don't have a windows box. Please check that everything still works. Please have a look at FindGNUWIN32.cmake, there are probably ways to improve this. The resulting GNUWIN32_DIR variable is used in other cmake modules as default path to search for headers and libraries. svn path=/trunk/KDE/kdelibs/; revision=508648 --- modules/FindKDEWIN32.cmake | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 modules/FindKDEWIN32.cmake (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake new file mode 100644 index 00000000..131c0354 --- /dev/null +++ b/modules/FindKDEWIN32.cmake @@ -0,0 +1,58 @@ +# - Try to find the KDEWIN32 library +# Once done this will define +# +# KDEWIN32_FOUND - system has KDEWIN32 +# KDEWIN32_INCLUDES - the KDEWIN32 include directories +# KDEWIN32_LIBRARIES - The libraries needed to use KDEWIN32 + +IF (WIN32) + +INCLUDE(MacroGetenvWinPath) + +MACRO_GETENV_WIN_PATH(_program_FILES_DIR PROGRAMFILES) + +FIND_PACKAGE(Qt4 REQUIRED) + +FIND_PATH(KDEWIN32_INCLUDE_DIR winposix_export.h + ${_program_FILES_DIR}/kdewin32/include +) + + +# at first find the kdewin32 library, this has to be compiled and installed before kdelibs/ +# search for kdewin32 in the default install directory for applications (default of (n)make install) +FIND_LIBRARY(KDEWIN32_LIBRARY NAMES kdewin32 + PATHS + ${_program_FILES_DIR}/kdewin32/lib +) + + +# kdelibs/win/ has to be built before the rest of kdelibs/ +# eventually it will be moved out from kdelibs/ +IF (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) + SET(KDEWIN32_FOUND TRUE) + # add the winsock2 library, using find_library or something like this would probably be better + SET(KDEWIN32_LIBRARIES ${KDEWIN32_LIBRARY} user32 shell32 ws2_32) + + IF(MINGW) + #mingw compiler + SET(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/mingw ${QT_INCLUDES}) + ELSE(MINGW) + # msvc compiler + # add the MS SDK include directory if available + MACRO_GETENV_WIN_PATH(MSSDK_DIR MSSDK) + SET(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${MSSDK_DIR}) + ENDIF(MINGW) + +ENDIF (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) + +IF (KDEWIN32_FOUND) + IF (NOT KDEWIN32_FIND_QUIETLY) + MESSAGE(STATUS "Found KDEWIN32: ${KDEWIN32_LIBRARY}") + ENDIF (NOT KDEWIN32_FIND_QUIETLY) +ELSE (KDEWIN32_FOUND) + IF (KDEWIN32_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find KDEWIN32 library") + ENDIF (KDEWIN32_FIND_REQUIRED) +ENDIF (KDEWIN32_FOUND) + +ENDIF (WIN32) -- cgit v1.2.1 From 00f37818f01673a028496d3c41f40f0c5e6ee654 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 13 Feb 2006 18:13:28 +0000 Subject: more verbose error message Alex svn path=/trunk/KDE/kdelibs/; revision=509112 --- modules/FindKDEWIN32.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 131c0354..cf8344ee 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -51,7 +51,7 @@ IF (KDEWIN32_FOUND) ENDIF (NOT KDEWIN32_FIND_QUIETLY) ELSE (KDEWIN32_FOUND) IF (KDEWIN32_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find KDEWIN32 library") + MESSAGE(SEND_ERROR "Could not find KDEWIN32 library\nPlease build and install kdelibs/win/ first") ENDIF (KDEWIN32_FIND_REQUIRED) ENDIF (KDEWIN32_FOUND) -- cgit v1.2.1 From 27c23eace05c4708938ba4c69e8ccc5ff110e4bb Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 14 Feb 2006 14:56:59 +0000 Subject: Restore FATAL_ERROR when KDEWIN32 is not found but is required. svn path=/trunk/KDE/kdelibs/; revision=509380 --- modules/FindKDEWIN32.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index cf8344ee..a71e04d2 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -51,7 +51,7 @@ IF (KDEWIN32_FOUND) ENDIF (NOT KDEWIN32_FIND_QUIETLY) ELSE (KDEWIN32_FOUND) IF (KDEWIN32_FIND_REQUIRED) - MESSAGE(SEND_ERROR "Could not find KDEWIN32 library\nPlease build and install kdelibs/win/ first") + MESSAGE(FATAL_ERROR "Could not find KDEWIN32 library\nPlease build and install kdelibs/win/ first") ENDIF (KDEWIN32_FIND_REQUIRED) ENDIF (KDEWIN32_FOUND) -- cgit v1.2.1 From ffc69376dc591eae7b0ed2e974a599fb1b8b2aa8 Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 15 Feb 2006 10:47:36 +0000 Subject: Lowercase some common keywords to improve readability svn path=/trunk/KDE/kdelibs/; revision=509624 --- modules/FindKDEWIN32.cmake | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index a71e04d2..0cf90ffd 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -5,7 +5,7 @@ # KDEWIN32_INCLUDES - the KDEWIN32 include directories # KDEWIN32_LIBRARIES - The libraries needed to use KDEWIN32 -IF (WIN32) +if (WIN32) INCLUDE(MacroGetenvWinPath) @@ -28,31 +28,31 @@ FIND_LIBRARY(KDEWIN32_LIBRARY NAMES kdewin32 # kdelibs/win/ has to be built before the rest of kdelibs/ # eventually it will be moved out from kdelibs/ -IF (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) - SET(KDEWIN32_FOUND TRUE) +if (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) + set(KDEWIN32_FOUND TRUE) # add the winsock2 library, using find_library or something like this would probably be better - SET(KDEWIN32_LIBRARIES ${KDEWIN32_LIBRARY} user32 shell32 ws2_32) + set(KDEWIN32_LIBRARIES ${KDEWIN32_LIBRARY} user32 shell32 ws2_32) - IF(MINGW) + if(MINGW) #mingw compiler - SET(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/mingw ${QT_INCLUDES}) - ELSE(MINGW) + set(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/mingw ${QT_INCLUDES}) + else(MINGW) # msvc compiler # add the MS SDK include directory if available MACRO_GETENV_WIN_PATH(MSSDK_DIR MSSDK) - SET(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${MSSDK_DIR}) - ENDIF(MINGW) + set(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${MSSDK_DIR}) + endif(MINGW) -ENDIF (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) - -IF (KDEWIN32_FOUND) - IF (NOT KDEWIN32_FIND_QUIETLY) - MESSAGE(STATUS "Found KDEWIN32: ${KDEWIN32_LIBRARY}") - ENDIF (NOT KDEWIN32_FIND_QUIETLY) -ELSE (KDEWIN32_FOUND) - IF (KDEWIN32_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find KDEWIN32 library\nPlease build and install kdelibs/win/ first") - ENDIF (KDEWIN32_FIND_REQUIRED) -ENDIF (KDEWIN32_FOUND) - -ENDIF (WIN32) +endif (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) + +if (KDEWIN32_FOUND) + if (not KDEWIN32_FIND_QUIETLY) + message(STATUS "Found KDEWIN32: ${KDEWIN32_LIBRARY}") + endif (not KDEWIN32_FIND_QUIETLY) +else (KDEWIN32_FOUND) + if (KDEWIN32_FIND_REQUIRED) + message(FATAL_ERROR "Could not find KDEWIN32 library\nPlease build and install kdelibs/win/ first") + endif (KDEWIN32_FIND_REQUIRED) +endif (KDEWIN32_FOUND) + +endif (WIN32) -- cgit v1.2.1 From eaad615ee85800bedbf2088326399027c95d0740 Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 15 Feb 2006 10:49:53 +0000 Subject: Hmm, "NOT" can't be lowercased. I tested before lowercasing that last one, of course... svn path=/trunk/KDE/kdelibs/; revision=509625 --- modules/FindKDEWIN32.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 0cf90ffd..2c981cc0 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -46,12 +46,12 @@ if (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) endif (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) if (KDEWIN32_FOUND) - if (not KDEWIN32_FIND_QUIETLY) + if (NOT KDEWIN32_FIND_QUIETLY) message(STATUS "Found KDEWIN32: ${KDEWIN32_LIBRARY}") - endif (not KDEWIN32_FIND_QUIETLY) + endif (NOT KDEWIN32_FIND_QUIETLY) else (KDEWIN32_FOUND) if (KDEWIN32_FIND_REQUIRED) - message(FATAL_ERROR "Could not find KDEWIN32 library\nPlease build and install kdelibs/win/ first") + message(FATAL_ERROR "Could NOT find KDEWIN32 library\nPlease build and install kdelibs/win/ first") endif (KDEWIN32_FIND_REQUIRED) endif (KDEWIN32_FOUND) -- cgit v1.2.1 From 0154f664ebf11b8a698d94a4fd417cbff97be81a Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Mon, 20 Mar 2006 21:09:34 +0000 Subject: minor cleanups: indenting, adding newline to end of file, etc. svn path=/trunk/KDE/kdelibs/; revision=520791 --- modules/FindKDEWIN32.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 2c981cc0..301f756f 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -33,15 +33,15 @@ if (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) # add the winsock2 library, using find_library or something like this would probably be better set(KDEWIN32_LIBRARIES ${KDEWIN32_LIBRARY} user32 shell32 ws2_32) - if(MINGW) + if (MINGW) #mingw compiler set(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/mingw ${QT_INCLUDES}) - else(MINGW) + else (MINGW) # msvc compiler # add the MS SDK include directory if available MACRO_GETENV_WIN_PATH(MSSDK_DIR MSSDK) set(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${MSSDK_DIR}) - endif(MINGW) + endif (MINGW) endif (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) -- cgit v1.2.1 From 5122b9d5277cf5a0ad6cd20eace8db8c40902be2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Sun, 14 May 2006 20:41:44 +0000 Subject: search for debug version (kdewin32d.lib) when compiling with msvc CCMAIL:neundorf@kde.org CCMAIL:Ch.Ehrlicher@gmx.de svn path=/trunk/KDE/kdelibs/; revision=540864 --- modules/FindKDEWIN32.cmake | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 301f756f..f9fa2aec 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -20,9 +20,15 @@ FIND_PATH(KDEWIN32_INCLUDE_DIR winposix_export.h # at first find the kdewin32 library, this has to be compiled and installed before kdelibs/ # search for kdewin32 in the default install directory for applications (default of (n)make install) -FIND_LIBRARY(KDEWIN32_LIBRARY NAMES kdewin32 - PATHS - ${_program_FILES_DIR}/kdewin32/lib +if (MSVC) + set(_KDEWIN32_POSTFIX d) +else (MSVC) + set(_KDEWIN32_POSTFIX ) +endif (MSVC) + +FIND_LIBRARY(KDEWIN32_LIBRARY NAMES kdewin32${_KDEWIN32_POSTFIX} + PATHS + ${_program_FILES_DIR}/kdewin32/lib ) -- cgit v1.2.1 From b5acfca94192e6e438221edd4c70eab4741f359e Mon Sep 17 00:00:00 2001 From: Paulo Moura Guedes Date: Mon, 15 May 2006 12:41:06 +0000 Subject: Have build type in consideration. CCMAIL: Peter Kummel [syntheticpp@gmx.net] svn path=/trunk/KDE/kdelibs/; revision=541049 --- modules/FindKDEWIN32.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index f9fa2aec..6bd8b9d3 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -20,11 +20,11 @@ FIND_PATH(KDEWIN32_INCLUDE_DIR winposix_export.h # at first find the kdewin32 library, this has to be compiled and installed before kdelibs/ # search for kdewin32 in the default install directory for applications (default of (n)make install) -if (MSVC) +if (MSVC AND CMAKE_BUILD_TYPE MATCHES Debug) set(_KDEWIN32_POSTFIX d) -else (MSVC) +else (MSVC AND CMAKE_BUILD_TYPE MATCHES Debug) set(_KDEWIN32_POSTFIX ) -endif (MSVC) +endif (MSVC AND CMAKE_BUILD_TYPE MATCHES Debug) FIND_LIBRARY(KDEWIN32_LIBRARY NAMES kdewin32${_KDEWIN32_POSTFIX} PATHS -- cgit v1.2.1 From 14f067d7391b81094423fd71eb0b57920036eccf Mon Sep 17 00:00:00 2001 From: Paulo Moura Guedes Date: Mon, 15 May 2006 15:21:32 +0000 Subject: This is valid not only for msvc. CCMAIL: Peter Kummel [syntheticpp@gmx.net] svn path=/trunk/KDE/kdelibs/; revision=541109 --- modules/FindKDEWIN32.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 6bd8b9d3..c3e76947 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -20,11 +20,11 @@ FIND_PATH(KDEWIN32_INCLUDE_DIR winposix_export.h # at first find the kdewin32 library, this has to be compiled and installed before kdelibs/ # search for kdewin32 in the default install directory for applications (default of (n)make install) -if (MSVC AND CMAKE_BUILD_TYPE MATCHES Debug) +if (CMAKE_BUILD_TYPE MATCHES Debug) set(_KDEWIN32_POSTFIX d) -else (MSVC AND CMAKE_BUILD_TYPE MATCHES Debug) +else (CMAKE_BUILD_TYPE MATCHES Debug) set(_KDEWIN32_POSTFIX ) -endif (MSVC AND CMAKE_BUILD_TYPE MATCHES Debug) +endif (CMAKE_BUILD_TYPE MATCHES Debug) FIND_LIBRARY(KDEWIN32_LIBRARY NAMES kdewin32${_KDEWIN32_POSTFIX} PATHS -- cgit v1.2.1 From bb19c2a64367b530e5c6f55d07da5c7fc4149823 Mon Sep 17 00:00:00 2001 From: Paulo Moura Guedes Date: Tue, 16 May 2006 08:10:44 +0000 Subject: Better. Only msvc requires same build type (release/debug). CCMAIL: Peter Kummel [syntheticpp@gmx.net] svn path=/trunk/KDE/kdelibs/; revision=541416 --- modules/FindKDEWIN32.cmake | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index c3e76947..a71ba499 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -31,6 +31,13 @@ FIND_LIBRARY(KDEWIN32_LIBRARY NAMES kdewin32${_KDEWIN32_POSTFIX} ${_program_FILES_DIR}/kdewin32/lib ) +if (NOT KDEWIN32_LIBRARY AND NOT MSVC) + # We can mix release/debug builds + FIND_LIBRARY(KDEWIN32_LIBRARY NAMES kdewin32 kdewin32d + PATHS + ${_program_FILES_DIR}/kdewin32/lib + ) +endif (NOT KDEWIN32_LIBRARY AND NOT MSVC) # kdelibs/win/ has to be built before the rest of kdelibs/ # eventually it will be moved out from kdelibs/ -- cgit v1.2.1 From ca1a3bc8885a44fec51e8fb2b3d53bc1fc9dda35 Mon Sep 17 00:00:00 2001 From: Paulo Moura Guedes Date: Tue, 16 May 2006 11:48:43 +0000 Subject: Even better. Suggested by Peter. CCMAIL: Peter Kummel [syntheticpp@gmx.net] svn path=/trunk/KDE/kdelibs/; revision=541478 --- modules/FindKDEWIN32.cmake | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index a71ba499..98c4f5db 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -20,24 +20,21 @@ FIND_PATH(KDEWIN32_INCLUDE_DIR winposix_export.h # at first find the kdewin32 library, this has to be compiled and installed before kdelibs/ # search for kdewin32 in the default install directory for applications (default of (n)make install) -if (CMAKE_BUILD_TYPE MATCHES Debug) - set(_KDEWIN32_POSTFIX d) -else (CMAKE_BUILD_TYPE MATCHES Debug) - set(_KDEWIN32_POSTFIX ) -endif (CMAKE_BUILD_TYPE MATCHES Debug) +set(_KDEWIN32_SEARCHNAMES kdewin32 kdewin32d) -FIND_LIBRARY(KDEWIN32_LIBRARY NAMES kdewin32${_KDEWIN32_POSTFIX} - PATHS - ${_program_FILES_DIR}/kdewin32/lib -) +#overwrite when using msvc, which cannot mix debug/release libraries +if(MSVC) + if(CMAKE_BUILD_TYPE MATCHES Debug) + set(_KDEWIN32_SEARCHNAMES kdewin32d ) + else(CMAKE_BUILD_TYPE MATCHES Debug) + set(_KDEWIN32_SEARCHNAMES kdewin32 ) + endif(CMAKE_BUILD_TYPE MATCHES Debug) +endif(MSVC) -if (NOT KDEWIN32_LIBRARY AND NOT MSVC) - # We can mix release/debug builds - FIND_LIBRARY(KDEWIN32_LIBRARY NAMES kdewin32 kdewin32d - PATHS - ${_program_FILES_DIR}/kdewin32/lib - ) -endif (NOT KDEWIN32_LIBRARY AND NOT MSVC) +FIND_LIBRARY(KDEWIN32_LIBRARY NAMES ${_KDEWIN32_SEARCHNAMES} + PATHS + ${_program_FILES_DIR}/kdewin32/lib +) # kdelibs/win/ has to be built before the rest of kdelibs/ # eventually it will be moved out from kdelibs/ -- cgit v1.2.1 From b69c0d30a452aecd3d4a1eb1535f26fdad9619aa Mon Sep 17 00:00:00 2001 From: Paulo Moura Guedes Date: Tue, 16 May 2006 20:46:27 +0000 Subject: Optimization: don't look twice for Qt 4. This is usually already done before in FindKDE4Internal.cmake. svn path=/trunk/KDE/kdelibs/; revision=541637 --- modules/FindKDEWIN32.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 98c4f5db..c9017602 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -11,7 +11,9 @@ INCLUDE(MacroGetenvWinPath) MACRO_GETENV_WIN_PATH(_program_FILES_DIR PROGRAMFILES) +IF(NOT QT4_FOUND) FIND_PACKAGE(Qt4 REQUIRED) +ENDIF(NOT QT4_FOUND) FIND_PATH(KDEWIN32_INCLUDE_DIR winposix_export.h ${_program_FILES_DIR}/kdewin32/include -- cgit v1.2.1 From f3a9780171e0b99fdefd7d6723f6da0d5cf40b7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Thu, 18 May 2006 14:38:29 +0000 Subject: handle all msvc generators correct: debug/release, nmake/project generators svn path=/trunk/KDE/kdelibs/; revision=542175 --- modules/FindKDEWIN32.cmake | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index c9017602..bec51304 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -22,22 +22,36 @@ FIND_PATH(KDEWIN32_INCLUDE_DIR winposix_export.h # at first find the kdewin32 library, this has to be compiled and installed before kdelibs/ # search for kdewin32 in the default install directory for applications (default of (n)make install) -set(_KDEWIN32_SEARCHNAMES kdewin32 kdewin32d) -#overwrite when using msvc, which cannot mix debug/release libraries -if(MSVC) - if(CMAKE_BUILD_TYPE MATCHES Debug) - set(_KDEWIN32_SEARCHNAMES kdewin32d ) - else(CMAKE_BUILD_TYPE MATCHES Debug) - set(_KDEWIN32_SEARCHNAMES kdewin32 ) - endif(CMAKE_BUILD_TYPE MATCHES Debug) -endif(MSVC) - -FIND_LIBRARY(KDEWIN32_LIBRARY NAMES ${_KDEWIN32_SEARCHNAMES} +FIND_LIBRARY(KDEWIN32_LIBRARY_RELEASE NAMES kdewin32 PATHS ${_program_FILES_DIR}/kdewin32/lib ) +# msvc makes a difference between debug and release +if(MSVC) + FIND_LIBRARY(KDEWIN32_LIBRARY_DEBUG NAMES kdewin32d + PATHS + ${_program_FILES_DIR}/kdewin32/lib + ) + if(MSVC_IDE) + # the ide needs the debug and release version + if( NOT KDEWIN32_LIBRARY_DEBUG OR NOT KDEWIN32_LIBRARY_RELEASE) + message(FATAL_ERROR "Could NOT find the debug AND release version of the KDEWIN32 library.\nYou need to have both to use MSVC projects.\nPlease build and install both kdelibs/win/ libraries first:\nUse a project generator or the cmake parameter\n-DCMAKE_BUILD_TYPE=release for building the release version nmake makefiles.") + endif( NOT KDEWIN32_LIBRARY_DEBUG OR NOT KDEWIN32_LIBRARY_RELEASE) + SET(KDEWIN32_LIBRARY optimized ${KDEWIN32_LIBRARY_RELEASE} debug ${KDEWIN32_LIBRARY_DEBUG}) + else(MSVC_IDE) + STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) + if(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_DEBUG}) + else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_RELEASE}) + endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + endif(MSVC_IDE) +else(MSVC) + set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_RELEASE}) +endif(MSVC) + # kdelibs/win/ has to be built before the rest of kdelibs/ # eventually it will be moved out from kdelibs/ if (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) -- cgit v1.2.1 From 629745908dbb7203d356cae1798e28dbd34a0f65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Thu, 18 May 2006 15:49:30 +0000 Subject: change error message svn path=/trunk/KDE/kdelibs/; revision=542209 --- modules/FindKDEWIN32.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index bec51304..eb0bfbbf 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -37,7 +37,7 @@ if(MSVC) if(MSVC_IDE) # the ide needs the debug and release version if( NOT KDEWIN32_LIBRARY_DEBUG OR NOT KDEWIN32_LIBRARY_RELEASE) - message(FATAL_ERROR "Could NOT find the debug AND release version of the KDEWIN32 library.\nYou need to have both to use MSVC projects.\nPlease build and install both kdelibs/win/ libraries first:\nUse a project generator or the cmake parameter\n-DCMAKE_BUILD_TYPE=release for building the release version nmake makefiles.") + message(FATAL_ERROR "\nCould NOT find the debug AND release version of the KDEWIN32 library.\nYou need to have both to use MSVC projects.\nPlease build and install both kdelibs/win/ libraries first.\n") endif( NOT KDEWIN32_LIBRARY_DEBUG OR NOT KDEWIN32_LIBRARY_RELEASE) SET(KDEWIN32_LIBRARY optimized ${KDEWIN32_LIBRARY_RELEASE} debug ${KDEWIN32_LIBRARY_DEBUG}) else(MSVC_IDE) -- cgit v1.2.1 From 700906bdeb7042b1584800877b5d6bc3ba702027 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 5 Jun 2006 16:47:04 +0000 Subject: remove MacroGetenvWinPath.cmake, this is not required anymore since cmake 2.4.1 Alex svn path=/trunk/KDE/kdelibs/; revision=548477 --- modules/FindKDEWIN32.cmake | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index eb0bfbbf..cf3a7b11 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -7,15 +7,13 @@ if (WIN32) -INCLUDE(MacroGetenvWinPath) +file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR) -MACRO_GETENV_WIN_PATH(_program_FILES_DIR PROGRAMFILES) +if(NOT QT4_FOUND) + find_package(Qt4 REQUIRED) +endif(NOT QT4_FOUND) -IF(NOT QT4_FOUND) -FIND_PACKAGE(Qt4 REQUIRED) -ENDIF(NOT QT4_FOUND) - -FIND_PATH(KDEWIN32_INCLUDE_DIR winposix_export.h +find_path(KDEWIN32_INCLUDE_DIR winposix_export.h ${_program_FILES_DIR}/kdewin32/include ) @@ -23,14 +21,14 @@ FIND_PATH(KDEWIN32_INCLUDE_DIR winposix_export.h # at first find the kdewin32 library, this has to be compiled and installed before kdelibs/ # search for kdewin32 in the default install directory for applications (default of (n)make install) -FIND_LIBRARY(KDEWIN32_LIBRARY_RELEASE NAMES kdewin32 +find_library(KDEWIN32_LIBRARY_RELEASE NAMES kdewin32 PATHS ${_program_FILES_DIR}/kdewin32/lib ) # msvc makes a difference between debug and release if(MSVC) - FIND_LIBRARY(KDEWIN32_LIBRARY_DEBUG NAMES kdewin32d + find_library(KDEWIN32_LIBRARY_DEBUG NAMES kdewin32d PATHS ${_program_FILES_DIR}/kdewin32/lib ) @@ -41,7 +39,7 @@ if(MSVC) endif( NOT KDEWIN32_LIBRARY_DEBUG OR NOT KDEWIN32_LIBRARY_RELEASE) SET(KDEWIN32_LIBRARY optimized ${KDEWIN32_LIBRARY_RELEASE} debug ${KDEWIN32_LIBRARY_DEBUG}) else(MSVC_IDE) - 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(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_DEBUG}) else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) @@ -65,7 +63,7 @@ if (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) else (MINGW) # msvc compiler # add the MS SDK include directory if available - MACRO_GETENV_WIN_PATH(MSSDK_DIR MSSDK) + file(TO_CMAKE_PATH "$ENV{MSSDK}" MSSDK_DIR) set(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${MSSDK_DIR}) endif (MINGW) -- cgit v1.2.1 From c778596920e0d5357f216c885e35b4f97d371a23 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 9 Sep 2006 10:18:35 +0000 Subject: added copyright notice everywhere. Now they all are BSD-licensed, as copyright holder I inserted everywhere the one who added it to svn (or Kitware if it is an enhanced copy from taken cmake) Some developers committed quite often but were not the ones who added the file, if you feel you have also copyright on the file add your name in the specific file. Copyright holders: CCMAIL: montel@kde.org CCMAIL: toscano.pino@tiscali.it CCMAIL: adymo@kdevelop.org CCMAIL: ranger@befunk.com CCMAIL: zack@kde.org CCMAIL: caslav.ilic@gmx.net CCMAIL: syntheticpp@yahoo.com CCMAIL: js@iidea.pl CCMAIL: michael.larouche@kdemail.net CCMAIL: ossi@kde.org CCMAIL: faure@kde.org Committers, but no files added so that they are not listed as copyright holders: CCMAIL: ch.ehrlicher@gmx.de CCMAIL: winter@kde.org CCMAIL: ralf.habacker@freenet.de CCMAIL: moura@kdewebdev.org CCMAIL: kde-buildsystem@kde.org Alex svn path=/trunk/KDE/kdelibs/; revision=582410 --- modules/FindKDEWIN32.cmake | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index cf3a7b11..385a34f4 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -4,6 +4,12 @@ # KDEWIN32_FOUND - system has KDEWIN32 # KDEWIN32_INCLUDES - the KDEWIN32 include directories # KDEWIN32_LIBRARIES - The libraries needed to use KDEWIN32 +# +# Copyright (c) 2006, Alexander Neundorf, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + if (WIN32) -- cgit v1.2.1 From aa5b265e4c7f4fe93fd2581e71b9519e3ccf346b Mon Sep 17 00:00:00 2001 From: Sebastian Sauer Date: Fri, 20 Oct 2006 22:55:00 +0000 Subject: cmake runs through now. Compiling on win/mingw could start :) svn path=/trunk/KDE/kdelibs/; revision=597606 --- modules/FindKDEWIN32.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 385a34f4..d5a5eee6 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -60,8 +60,11 @@ endif(MSVC) # eventually it will be moved out from kdelibs/ if (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) set(KDEWIN32_FOUND TRUE) - # add the winsock2 library, using find_library or something like this would probably be better - set(KDEWIN32_LIBRARIES ${KDEWIN32_LIBRARY} user32 shell32 ws2_32) + # add the winsock2 library + find_library(WIN32_USER32_LIBRARY NAMES user32 PATHS $ENV{WINDIR}/system32) + find_library(WIN32_SHELL32_LIBRARY NAMES shell32 PATHS $ENV{WINDIR}/system32) + find_library(WIN32_WS2_LIBRARY NAMES ws2_32 PATHS $ENV{WINDIR}/system32) + set(KDEWIN32_LIBRARIES "${KDEWIN32_LIBRARY} ${WIN32_USER32_LIBRARY} ${WIN32_SHELL32_LIBRARY} ${WIN32_WS2_LIBRARY}") if (MINGW) #mingw compiler -- cgit v1.2.1 From 5ee682a9f2a5fd346ef8ec7f3bb7292103ecb843 Mon Sep 17 00:00:00 2001 From: Sebastian Sauer Date: Sat, 21 Oct 2006 00:55:03 +0000 Subject: * added ${KDEWIN32_LIBRARY_PATH} * use find_library Now linking fails cause of the on win32 missing dbus libs... svn path=/trunk/KDE/kdelibs/; revision=597618 --- modules/FindKDEWIN32.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index d5a5eee6..479df392 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -27,9 +27,10 @@ find_path(KDEWIN32_INCLUDE_DIR winposix_export.h # at first find the kdewin32 library, this has to be compiled and installed before kdelibs/ # search for kdewin32 in the default install directory for applications (default of (n)make install) +set(KDEWIN32_LIBRARY_PATH ${_program_FILES_DIR}/kdewin32/lib) find_library(KDEWIN32_LIBRARY_RELEASE NAMES kdewin32 PATHS - ${_program_FILES_DIR}/kdewin32/lib + ${KDEWIN32_LIBRARY_PATH} ) # msvc makes a difference between debug and release -- cgit v1.2.1 From 7d87c59aea815c6be72a6755bb288b56cf7849ad Mon Sep 17 00:00:00 2001 From: Sebastian Sauer Date: Sat, 21 Oct 2006 03:20:56 +0000 Subject: added temp info for ppl who may like to try to get it compiled under win/mingw. svn path=/trunk/KDE/kdelibs/; revision=597625 --- modules/FindKDEWIN32.cmake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 479df392..508d93af 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -13,6 +13,9 @@ if (WIN32) +# temporary information +message("NOTE: first try to 'cmake -G \"MinGW Makefiles\" ..\\kdelibs\\' will fail with an error in FindZLIB.cmake. Just retry and it works. The bug got reported and will hopefully be fixed in >cmake 2.4.3") + file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR) if(NOT QT4_FOUND) -- cgit v1.2.1 From 015ca06395f0820b2c81e943fa9067e7084410cb Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sat, 21 Oct 2006 09:56:36 +0000 Subject: This is not needed at all - it worked before without and now it doesn' work with msvc anymore! cmake adds those libs automagically afaik CCMAIL: mail@dipe.org CCMAIL: kde-windows@kde.org svn path=/trunk/KDE/kdelibs/; revision=597662 --- modules/FindKDEWIN32.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 508d93af..ec3febe6 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -65,10 +65,10 @@ endif(MSVC) if (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) set(KDEWIN32_FOUND TRUE) # add the winsock2 library - find_library(WIN32_USER32_LIBRARY NAMES user32 PATHS $ENV{WINDIR}/system32) - find_library(WIN32_SHELL32_LIBRARY NAMES shell32 PATHS $ENV{WINDIR}/system32) - find_library(WIN32_WS2_LIBRARY NAMES ws2_32 PATHS $ENV{WINDIR}/system32) - set(KDEWIN32_LIBRARIES "${KDEWIN32_LIBRARY} ${WIN32_USER32_LIBRARY} ${WIN32_SHELL32_LIBRARY} ${WIN32_WS2_LIBRARY}") + #find_library(WIN32_USER32_LIBRARY NAMES user32 PATHS $ENV{WINDIR}/system32) + #find_library(WIN32_SHELL32_LIBRARY NAMES shell32 PATHS $ENV{WINDIR}/system32) + #find_library(WIN32_WS2_LIBRARY NAMES ws2_32 PATHS $ENV{WINDIR}/system32) + #set(KDEWIN32_LIBRARIES "${KDEWIN32_LIBRARY} ${WIN32_USER32_LIBRARY} ${WIN32_SHELL32_LIBRARY} ${WIN32_WS2_LIBRARY}") if (MINGW) #mingw compiler -- cgit v1.2.1 From 6ed3895dfc8904066d2dd0674035f5618709722a Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sun, 22 Oct 2006 13:47:29 +0000 Subject: this should fix the linker errors. Since those libs are system libs, there is no need to do an extra search to find them - if they're not available, we would not be able to link any bigger program on win32 @sebsauer: I don't get an error in FindZLib.cmake ... svn path=/trunk/KDE/kdelibs/; revision=598092 --- modules/FindKDEWIN32.cmake | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index ec3febe6..17a46761 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -64,11 +64,8 @@ endif(MSVC) # eventually it will be moved out from kdelibs/ if (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) set(KDEWIN32_FOUND TRUE) - # add the winsock2 library - #find_library(WIN32_USER32_LIBRARY NAMES user32 PATHS $ENV{WINDIR}/system32) - #find_library(WIN32_SHELL32_LIBRARY NAMES shell32 PATHS $ENV{WINDIR}/system32) - #find_library(WIN32_WS2_LIBRARY NAMES ws2_32 PATHS $ENV{WINDIR}/system32) - #set(KDEWIN32_LIBRARIES "${KDEWIN32_LIBRARY} ${WIN32_USER32_LIBRARY} ${WIN32_SHELL32_LIBRARY} ${WIN32_WS2_LIBRARY}") + # add needed system libs + set(KDEWIN32_LIBRARIES ${KDEWIN32_LIBRARY} user32 shell32 ws2_32) if (MINGW) #mingw compiler -- cgit v1.2.1 From dd1340092d541bf36f69369fd13150dbd949697c Mon Sep 17 00:00:00 2001 From: Sebastian Sauer Date: Tue, 24 Oct 2006 01:09:12 +0000 Subject: =?UTF-8?q?remove=20also=20the=20'NOTE=C3=83E'=20agai?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/trunk/KDE/kdelibs/; revision=598585 --- modules/FindKDEWIN32.cmake | 3 --- 1 file changed, 3 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 17a46761..7bd19d2f 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -13,9 +13,6 @@ if (WIN32) -# temporary information -message("NOTE: first try to 'cmake -G \"MinGW Makefiles\" ..\\kdelibs\\' will fail with an error in FindZLIB.cmake. Just retry and it works. The bug got reported and will hopefully be fixed in >cmake 2.4.3") - file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR) if(NOT QT4_FOUND) -- cgit v1.2.1 From aae517b4cf8747868e564ad545d41ec42e667be1 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 9 Nov 2006 06:47:50 +0000 Subject: I choose to install it nowhere in program_files but right in KDE's install path svn path=/trunk/KDE/kdelibs/; revision=603469 --- modules/FindKDEWIN32.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 7bd19d2f..afa8ee9b 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -20,7 +20,7 @@ if(NOT QT4_FOUND) endif(NOT QT4_FOUND) find_path(KDEWIN32_INCLUDE_DIR winposix_export.h - ${_program_FILES_DIR}/kdewin32/include + ${_program_FILES_DIR}/kdewin32/include ${CMAKE_INSTALL_PREFIX}/include ) @@ -30,14 +30,14 @@ find_path(KDEWIN32_INCLUDE_DIR winposix_export.h set(KDEWIN32_LIBRARY_PATH ${_program_FILES_DIR}/kdewin32/lib) find_library(KDEWIN32_LIBRARY_RELEASE NAMES kdewin32 PATHS - ${KDEWIN32_LIBRARY_PATH} + ${KDEWIN32_LIBRARY_PATH} ${CMAKE_INSTALL_PREFIX}/lib ) # msvc makes a difference between debug and release if(MSVC) find_library(KDEWIN32_LIBRARY_DEBUG NAMES kdewin32d PATHS - ${_program_FILES_DIR}/kdewin32/lib + ${_program_FILES_DIR}/kdewin32/lib ${CMAKE_INSTALL_PREFIX}/lib ) if(MSVC_IDE) # the ide needs the debug and release version -- cgit v1.2.1 From acbefba7a800dddffd27f46ca56dac86cd158015 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Mon, 26 Feb 2007 17:53:55 +0000 Subject: add kdewin32 include & lib to CMAKE_REQUIRED_INCLUDES/LIBRARIES svn path=/trunk/KDE/kdelibs/; revision=637512 --- modules/FindKDEWIN32.cmake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index afa8ee9b..15f32198 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -86,4 +86,7 @@ else (KDEWIN32_FOUND) endif (KDEWIN32_FIND_REQUIRED) endif (KDEWIN32_FOUND) +set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${KDEWIN32_INCLUDES}) +set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${KDEWIN32_LIBRARIES}) + endif (WIN32) -- cgit v1.2.1 From c78fca377f2cb783c2c98af99ae3d1f257776691 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Tue, 10 Apr 2007 06:49:38 +0000 Subject: fixed indention svn path=/trunk/KDE/kdelibs/; revision=652128 --- modules/FindKDEWIN32.cmake | 134 ++++++++++++++++++++++----------------------- 1 file changed, 67 insertions(+), 67 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 15f32198..ee49bc41 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -13,80 +13,80 @@ if (WIN32) -file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR) - -if(NOT QT4_FOUND) - find_package(Qt4 REQUIRED) -endif(NOT QT4_FOUND) - -find_path(KDEWIN32_INCLUDE_DIR winposix_export.h - ${_program_FILES_DIR}/kdewin32/include ${CMAKE_INSTALL_PREFIX}/include -) - - -# at first find the kdewin32 library, this has to be compiled and installed before kdelibs/ -# search for kdewin32 in the default install directory for applications (default of (n)make install) - -set(KDEWIN32_LIBRARY_PATH ${_program_FILES_DIR}/kdewin32/lib) -find_library(KDEWIN32_LIBRARY_RELEASE NAMES kdewin32 - PATHS - ${KDEWIN32_LIBRARY_PATH} ${CMAKE_INSTALL_PREFIX}/lib -) - -# msvc makes a difference between debug and release -if(MSVC) - find_library(KDEWIN32_LIBRARY_DEBUG NAMES kdewin32d - PATHS - ${_program_FILES_DIR}/kdewin32/lib ${CMAKE_INSTALL_PREFIX}/lib - ) - if(MSVC_IDE) - # the ide needs the debug and release version - if( NOT KDEWIN32_LIBRARY_DEBUG OR NOT KDEWIN32_LIBRARY_RELEASE) - message(FATAL_ERROR "\nCould NOT find the debug AND release version of the KDEWIN32 library.\nYou need to have both to use MSVC projects.\nPlease build and install both kdelibs/win/ libraries first.\n") - endif( NOT KDEWIN32_LIBRARY_DEBUG OR NOT KDEWIN32_LIBRARY_RELEASE) - SET(KDEWIN32_LIBRARY optimized ${KDEWIN32_LIBRARY_RELEASE} debug ${KDEWIN32_LIBRARY_DEBUG}) - else(MSVC_IDE) - string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) - if(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_DEBUG}) - else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_RELEASE}) - endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - endif(MSVC_IDE) -else(MSVC) - set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_RELEASE}) -endif(MSVC) - -# kdelibs/win/ has to be built before the rest of kdelibs/ -# eventually it will be moved out from kdelibs/ -if (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) - set(KDEWIN32_FOUND TRUE) - # add needed system libs - set(KDEWIN32_LIBRARIES ${KDEWIN32_LIBRARY} user32 shell32 ws2_32) - - if (MINGW) + file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR) + + if(NOT QT4_FOUND) + find_package(Qt4 REQUIRED) + endif(NOT QT4_FOUND) + + find_path(KDEWIN32_INCLUDE_DIR winposix_export.h + ${_program_FILES_DIR}/kdewin32/include ${CMAKE_INSTALL_PREFIX}/include + ) + + + # at first find the kdewin32 library, this has to be compiled and installed before kdelibs/ + # search for kdewin32 in the default install directory for applications (default of (n)make install) + + set(KDEWIN32_LIBRARY_PATH ${_program_FILES_DIR}/kdewin32/lib) + find_library(KDEWIN32_LIBRARY_RELEASE NAMES kdewin32 + PATHS + ${KDEWIN32_LIBRARY_PATH} ${CMAKE_INSTALL_PREFIX}/lib + ) + + # msvc makes a difference between debug and release + if(MSVC) + find_library(KDEWIN32_LIBRARY_DEBUG NAMES kdewin32d + PATHS + ${_program_FILES_DIR}/kdewin32/lib ${CMAKE_INSTALL_PREFIX}/lib + ) + if(MSVC_IDE) + # the ide needs the debug and release version + if( NOT KDEWIN32_LIBRARY_DEBUG OR NOT KDEWIN32_LIBRARY_RELEASE) + message(FATAL_ERROR "\nCould NOT find the debug AND release version of the KDEWIN32 library.\nYou need to have both to use MSVC projects.\nPlease build and install both kdelibs/win/ libraries first.\n") + endif( NOT KDEWIN32_LIBRARY_DEBUG OR NOT KDEWIN32_LIBRARY_RELEASE) + SET(KDEWIN32_LIBRARY optimized ${KDEWIN32_LIBRARY_RELEASE} debug ${KDEWIN32_LIBRARY_DEBUG}) + else(MSVC_IDE) + string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) + if(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_DEBUG}) + else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_RELEASE}) + endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + endif(MSVC_IDE) + else(MSVC) + set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_RELEASE}) + endif(MSVC) + + # kdelibs/win/ has to be built before the rest of kdelibs/ + # eventually it will be moved out from kdelibs/ + if (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) + set(KDEWIN32_FOUND TRUE) + # add needed system libs + set(KDEWIN32_LIBRARIES ${KDEWIN32_LIBRARY} user32 shell32 ws2_32) + + if (MINGW) #mingw compiler set(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/mingw ${QT_INCLUDES}) - else (MINGW) + else (MINGW) # msvc compiler # add the MS SDK include directory if available file(TO_CMAKE_PATH "$ENV{MSSDK}" MSSDK_DIR) set(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${MSSDK_DIR}) - endif (MINGW) - -endif (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) - -if (KDEWIN32_FOUND) - if (NOT KDEWIN32_FIND_QUIETLY) + endif (MINGW) + + endif (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) + + if (KDEWIN32_FOUND) + if (NOT KDEWIN32_FIND_QUIETLY) message(STATUS "Found KDEWIN32: ${KDEWIN32_LIBRARY}") - endif (NOT KDEWIN32_FIND_QUIETLY) -else (KDEWIN32_FOUND) - if (KDEWIN32_FIND_REQUIRED) + endif (NOT KDEWIN32_FIND_QUIETLY) + else (KDEWIN32_FOUND) + if (KDEWIN32_FIND_REQUIRED) message(FATAL_ERROR "Could NOT find KDEWIN32 library\nPlease build and install kdelibs/win/ first") - endif (KDEWIN32_FIND_REQUIRED) -endif (KDEWIN32_FOUND) - -set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${KDEWIN32_INCLUDES}) -set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${KDEWIN32_LIBRARIES}) + endif (KDEWIN32_FIND_REQUIRED) + endif (KDEWIN32_FOUND) + + set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${KDEWIN32_INCLUDES}) + set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${KDEWIN32_LIBRARIES}) endif (WIN32) -- cgit v1.2.1 From 0d2140da2badee431b04ddede982118eed31a0a2 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Tue, 10 Apr 2007 06:53:36 +0000 Subject: converted tabs into spaces svn path=/trunk/KDE/kdelibs/; revision=652131 --- modules/FindKDEWIN32.cmake | 60 +++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index ee49bc41..6191f38f 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -14,56 +14,56 @@ if (WIN32) file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR) - + if(NOT QT4_FOUND) find_package(Qt4 REQUIRED) endif(NOT QT4_FOUND) - + find_path(KDEWIN32_INCLUDE_DIR winposix_export.h ${_program_FILES_DIR}/kdewin32/include ${CMAKE_INSTALL_PREFIX}/include ) - - + + # at first find the kdewin32 library, this has to be compiled and installed before kdelibs/ # search for kdewin32 in the default install directory for applications (default of (n)make install) - + set(KDEWIN32_LIBRARY_PATH ${_program_FILES_DIR}/kdewin32/lib) find_library(KDEWIN32_LIBRARY_RELEASE NAMES kdewin32 PATHS ${KDEWIN32_LIBRARY_PATH} ${CMAKE_INSTALL_PREFIX}/lib ) - + # msvc makes a difference between debug and release if(MSVC) - find_library(KDEWIN32_LIBRARY_DEBUG NAMES kdewin32d - PATHS - ${_program_FILES_DIR}/kdewin32/lib ${CMAKE_INSTALL_PREFIX}/lib - ) - if(MSVC_IDE) - # the ide needs the debug and release version - if( NOT KDEWIN32_LIBRARY_DEBUG OR NOT KDEWIN32_LIBRARY_RELEASE) - message(FATAL_ERROR "\nCould NOT find the debug AND release version of the KDEWIN32 library.\nYou need to have both to use MSVC projects.\nPlease build and install both kdelibs/win/ libraries first.\n") - endif( NOT KDEWIN32_LIBRARY_DEBUG OR NOT KDEWIN32_LIBRARY_RELEASE) - SET(KDEWIN32_LIBRARY optimized ${KDEWIN32_LIBRARY_RELEASE} debug ${KDEWIN32_LIBRARY_DEBUG}) - else(MSVC_IDE) - string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) - if(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_DEBUG}) - else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_RELEASE}) - endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - endif(MSVC_IDE) + find_library(KDEWIN32_LIBRARY_DEBUG NAMES kdewin32d + PATHS + ${_program_FILES_DIR}/kdewin32/lib ${CMAKE_INSTALL_PREFIX}/lib + ) + if(MSVC_IDE) + # the ide needs the debug and release version + if( NOT KDEWIN32_LIBRARY_DEBUG OR NOT KDEWIN32_LIBRARY_RELEASE) + message(FATAL_ERROR "\nCould NOT find the debug AND release version of the KDEWIN32 library.\nYou need to have both to use MSVC projects.\nPlease build and install both kdelibs/win/ libraries first.\n") + endif( NOT KDEWIN32_LIBRARY_DEBUG OR NOT KDEWIN32_LIBRARY_RELEASE) + SET(KDEWIN32_LIBRARY optimized ${KDEWIN32_LIBRARY_RELEASE} debug ${KDEWIN32_LIBRARY_DEBUG}) + else(MSVC_IDE) + string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) + if(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_DEBUG}) + else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_RELEASE}) + endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + endif(MSVC_IDE) else(MSVC) - set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_RELEASE}) + set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_RELEASE}) endif(MSVC) - + # kdelibs/win/ has to be built before the rest of kdelibs/ # eventually it will be moved out from kdelibs/ if (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) set(KDEWIN32_FOUND TRUE) # add needed system libs set(KDEWIN32_LIBRARIES ${KDEWIN32_LIBRARY} user32 shell32 ws2_32) - + if (MINGW) #mingw compiler set(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/mingw ${QT_INCLUDES}) @@ -73,9 +73,9 @@ if (WIN32) file(TO_CMAKE_PATH "$ENV{MSSDK}" MSSDK_DIR) set(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${MSSDK_DIR}) endif (MINGW) - + endif (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) - + if (KDEWIN32_FOUND) if (NOT KDEWIN32_FIND_QUIETLY) message(STATUS "Found KDEWIN32: ${KDEWIN32_LIBRARY}") @@ -85,7 +85,7 @@ if (WIN32) message(FATAL_ERROR "Could NOT find KDEWIN32 library\nPlease build and install kdelibs/win/ first") endif (KDEWIN32_FIND_REQUIRED) endif (KDEWIN32_FOUND) - + set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${KDEWIN32_INCLUDES}) set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${KDEWIN32_LIBRARIES}) -- cgit v1.2.1 From ddff30d90a1fd77251ab3f4c23488494479ce1dd Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Tue, 10 Apr 2007 16:01:34 +0000 Subject: - added search for environment variable KDEWIN32_DIR - fixed zlib search problem svn path=/trunk/KDE/kdelibs/; revision=652282 --- modules/FindKDEWIN32.cmake | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 6191f38f..5ecb13fe 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -1,4 +1,5 @@ -# - Try to find the KDEWIN32 library +# - Try to find the directory in which the kdewin32 library and other win32 related libraries lives +# # Once done this will define # # KDEWIN32_FOUND - system has KDEWIN32 @@ -13,31 +14,45 @@ if (WIN32) - file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR) + if (NOT KDEWIN32_DIR) + if(NOT QT4_FOUND) + find_package(Qt4 REQUIRED) + endif(NOT QT4_FOUND) - if(NOT QT4_FOUND) - find_package(Qt4 REQUIRED) - endif(NOT QT4_FOUND) + # check for enviroment variable first + file(TO_CMAKE_PATH "$ENV{KDEWIN32_DIR}" KDEWIN32_DIR) + + # then check default installation dir + if (NOT KDEWIN32_DIR) + file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _progFiles) + find_file(KDEWIN32_DIR_tmp kdewin32 + PATHS + "${_progFiles}" + ) + set (KDEWIN32_DIR ${KDEWIN32_DIR_tmp}) + endif (NOT KDEWIN32_DIR) + endif (NOT KDEWIN32_DIR) find_path(KDEWIN32_INCLUDE_DIR winposix_export.h - ${_program_FILES_DIR}/kdewin32/include ${CMAKE_INSTALL_PREFIX}/include + ${KDEWIN32_DIR}/include + ${CMAKE_INSTALL_PREFIX}/include ) - # at first find the kdewin32 library, this has to be compiled and installed before kdelibs/ # search for kdewin32 in the default install directory for applications (default of (n)make install) - set(KDEWIN32_LIBRARY_PATH ${_program_FILES_DIR}/kdewin32/lib) find_library(KDEWIN32_LIBRARY_RELEASE NAMES kdewin32 PATHS - ${KDEWIN32_LIBRARY_PATH} ${CMAKE_INSTALL_PREFIX}/lib + ${KDEWIN32_DIR}/lib + ${CMAKE_INSTALL_PREFIX}/lib ) # msvc makes a difference between debug and release if(MSVC) find_library(KDEWIN32_LIBRARY_DEBUG NAMES kdewin32d PATHS - ${_program_FILES_DIR}/kdewin32/lib ${CMAKE_INSTALL_PREFIX}/lib + ${KDEWIN32_DIR}/lib + ${CMAKE_INSTALL_PREFIX}/lib ) if(MSVC_IDE) # the ide needs the debug and release version @@ -82,10 +97,15 @@ if (WIN32) endif (NOT KDEWIN32_FIND_QUIETLY) else (KDEWIN32_FOUND) if (KDEWIN32_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find KDEWIN32 library\nPlease build and install kdelibs/win/ first") + message(FATAL_ERROR "Could NOT find KDEWIN32 library\nPlease install it first") endif (KDEWIN32_FIND_REQUIRED) endif (KDEWIN32_FOUND) + # add include path and library to all targets, this is required because + # cmake's 2.4.6 FindZLib.cmake does not use CMAKE_REQUIRED... vars + set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${KDEWIN32_INCLUDES}) + set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${KDEWIN32_DIR}/lib) + set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${KDEWIN32_INCLUDES}) set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${KDEWIN32_LIBRARIES}) -- cgit v1.2.1 From 18c4ff6bdfa3ea3973338ed7d38e1ad9398f2084 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Fri, 13 Apr 2007 16:00:47 +0000 Subject: - avoid search in PATH environment variable, which results in using kdewin32.dll instead of relating dll.a on mingw svn path=/trunk/KDE/kdelibs/; revision=653552 --- modules/FindKDEWIN32.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 5ecb13fe..8ac3fe58 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -1,5 +1,5 @@ # - Try to find the directory in which the kdewin32 library and other win32 related libraries lives -# +# # Once done this will define # # KDEWIN32_FOUND - system has KDEWIN32 @@ -43,8 +43,9 @@ if (WIN32) find_library(KDEWIN32_LIBRARY_RELEASE NAMES kdewin32 PATHS - ${KDEWIN32_DIR}/lib - ${CMAKE_INSTALL_PREFIX}/lib + ${KDEWIN32_DIR}/lib + ${CMAKE_INSTALL_PREFIX}/lib + NO_SYSTEM_ENVIRONMENT_PATH ) # msvc makes a difference between debug and release @@ -53,6 +54,7 @@ if (WIN32) PATHS ${KDEWIN32_DIR}/lib ${CMAKE_INSTALL_PREFIX}/lib + NO_SYSTEM_ENVIRONMENT_PATH ) if(MSVC_IDE) # the ide needs the debug and release version -- cgit v1.2.1 From 61c82b748738d4692b1a092e4d66e151b1971124 Mon Sep 17 00:00:00 2001 From: Andreas Pakulat Date: Fri, 20 Apr 2007 20:50:44 +0000 Subject: Find debug libs of kdewin32 for mingw too svn path=/trunk/KDE/kdelibs/; revision=656278 --- modules/FindKDEWIN32.cmake | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 8ac3fe58..ac284cd4 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -41,13 +41,20 @@ if (WIN32) # at first find the kdewin32 library, this has to be compiled and installed before kdelibs/ # search for kdewin32 in the default install directory for applications (default of (n)make install) - find_library(KDEWIN32_LIBRARY_RELEASE NAMES kdewin32 + find_library(KDEWIN32_LIBRARY_DEBUG NAMES kdewin32d PATHS ${KDEWIN32_DIR}/lib ${CMAKE_INSTALL_PREFIX}/lib NO_SYSTEM_ENVIRONMENT_PATH ) + find_library(KDEWIN32_LIBRARY_RELEASE NAMES kdewin32 + PATHS + ${KDEWIN32_DIR}/lib + ${CMAKE_INSTALL_PREFIX}/lib + NO_SYSTEM_ENVIRONMENT_PATH + ) + # msvc makes a difference between debug and release if(MSVC) find_library(KDEWIN32_LIBRARY_DEBUG NAMES kdewin32d @@ -71,7 +78,11 @@ if (WIN32) endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) endif(MSVC_IDE) else(MSVC) - set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_RELEASE}) + if(KDEWIN32_LIBRARY_RELEASE) + set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_RELEASE}) + else(KDEWIN32_LIBRARY_RELEASE) + set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_DEBUG}) + endif(KDEWIN32_LIBRARY_RELEASE) endif(MSVC) # kdelibs/win/ has to be built before the rest of kdelibs/ -- cgit v1.2.1 From 7e7111d020a1d9859928b6e4c83efd81df6ad703 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Fri, 8 Jun 2007 07:44:16 +0000 Subject: - splitted KDEWIN32 and GUNWIN32 module into KDEWIN and KDEWIN32, where KDEWIN sets include/library search path for all other modules and KDEWIN32 search for kdewin32 library in the found locations. svn path=/trunk/KDE/kdelibs/; revision=672805 --- modules/FindKDEWIN32.cmake | 162 ++++++++++++++++++++------------------------- 1 file changed, 72 insertions(+), 90 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index ac284cd4..17eab61d 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -7,119 +7,101 @@ # KDEWIN32_LIBRARIES - The libraries needed to use KDEWIN32 # # Copyright (c) 2006, Alexander Neundorf, +# Copyright (c) 2007, 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 KDEWIN32_DIR) - if(NOT QT4_FOUND) - find_package(Qt4 REQUIRED) - endif(NOT QT4_FOUND) - - # check for enviroment variable first - file(TO_CMAKE_PATH "$ENV{KDEWIN32_DIR}" KDEWIN32_DIR) - - # then check default installation dir - if (NOT KDEWIN32_DIR) - file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _progFiles) - find_file(KDEWIN32_DIR_tmp kdewin32 - PATHS - "${_progFiles}" - ) - set (KDEWIN32_DIR ${KDEWIN32_DIR_tmp}) - endif (NOT KDEWIN32_DIR) - endif (NOT KDEWIN32_DIR) - - find_path(KDEWIN32_INCLUDE_DIR winposix_export.h - ${KDEWIN32_DIR}/include - ${CMAKE_INSTALL_PREFIX}/include - ) + if(NOT KDEWIN_FOUND) + find_package(KDEWIN REQUIRED) + endif(NOT KDEWIN_FOUND) - # at first find the kdewin32 library, this has to be compiled and installed before kdelibs/ - # search for kdewin32 in the default install directory for applications (default of (n)make install) - - find_library(KDEWIN32_LIBRARY_DEBUG NAMES kdewin32d - PATHS - ${KDEWIN32_DIR}/lib - ${CMAKE_INSTALL_PREFIX}/lib - NO_SYSTEM_ENVIRONMENT_PATH - ) + find_path(KDEWIN32_INCLUDE_DIR winposix_export.h + ${CMAKE_INCLUDE_PATH} + ${CMAKE_INSTALL_PREFIX}/include + ) + + # search for kdewin32 in the default install directory for applications (default of (n)make install) - find_library(KDEWIN32_LIBRARY_RELEASE NAMES kdewin32 - PATHS - ${KDEWIN32_DIR}/lib - ${CMAKE_INSTALL_PREFIX}/lib - NO_SYSTEM_ENVIRONMENT_PATH - ) - - # msvc makes a difference between debug and release - if(MSVC) find_library(KDEWIN32_LIBRARY_DEBUG NAMES kdewin32d PATHS - ${KDEWIN32_DIR}/lib + ${CMAKE_LIBRARY_PATH} ${CMAKE_INSTALL_PREFIX}/lib NO_SYSTEM_ENVIRONMENT_PATH ) - if(MSVC_IDE) - # the ide needs the debug and release version - if( NOT KDEWIN32_LIBRARY_DEBUG OR NOT KDEWIN32_LIBRARY_RELEASE) - message(FATAL_ERROR "\nCould NOT find the debug AND release version of the KDEWIN32 library.\nYou need to have both to use MSVC projects.\nPlease build and install both kdelibs/win/ libraries first.\n") - endif( NOT KDEWIN32_LIBRARY_DEBUG OR NOT KDEWIN32_LIBRARY_RELEASE) - SET(KDEWIN32_LIBRARY optimized ${KDEWIN32_LIBRARY_RELEASE} debug ${KDEWIN32_LIBRARY_DEBUG}) - else(MSVC_IDE) - string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) - if(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_DEBUG}) - else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_RELEASE}) - endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - endif(MSVC_IDE) - else(MSVC) - if(KDEWIN32_LIBRARY_RELEASE) - set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_RELEASE}) - else(KDEWIN32_LIBRARY_RELEASE) - set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_DEBUG}) - endif(KDEWIN32_LIBRARY_RELEASE) - endif(MSVC) - # kdelibs/win/ has to be built before the rest of kdelibs/ - # eventually it will be moved out from kdelibs/ - if (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) - set(KDEWIN32_FOUND TRUE) - # add needed system libs - set(KDEWIN32_LIBRARIES ${KDEWIN32_LIBRARY} user32 shell32 ws2_32) - - if (MINGW) - #mingw compiler - set(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_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(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${MSSDK_DIR}) - endif (MINGW) + find_library(KDEWIN32_LIBRARY_RELEASE NAMES kdewin32 + PATHS + ${CMAKE_LIBRARY_PATH} + ${CMAKE_INSTALL_PREFIX}/lib + NO_SYSTEM_ENVIRONMENT_PATH + ) + + # msvc makes a difference between debug and release + if(MSVC) + find_library(KDEWIN32_LIBRARY_DEBUG NAMES kdewin32d + PATHS + ${CMAKE_LIBRARY_PATH + ${CMAKE_INSTALL_PREFIX}/lib + NO_SYSTEM_ENVIRONMENT_PATH + ) + if(MSVC_IDE) + # the ide needs the debug and release version + if( NOT KDEWIN32_LIBRARY_DEBUG OR NOT KDEWIN32_LIBRARY_RELEASE) + message(FATAL_ERROR "\nCould NOT find the debug AND release version of the KDEWIN32 library.\nYou need to have both to use MSVC projects.\nPlease build and install both kdelibs/win/ libraries first.\n") + endif( NOT KDEWIN32_LIBRARY_DEBUG OR NOT KDEWIN32_LIBRARY_RELEASE) + SET(KDEWIN32_LIBRARY optimized ${KDEWIN32_LIBRARY_RELEASE} debug ${KDEWIN32_LIBRARY_DEBUG}) + else(MSVC_IDE) + string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) + if(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_DEBUG}) + else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_RELEASE}) + endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + endif(MSVC_IDE) + else(MSVC) + if(KDEWIN32_LIBRARY_RELEASE) + set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_RELEASE}) + else(KDEWIN32_LIBRARY_RELEASE) + set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_DEBUG}) + endif(KDEWIN32_LIBRARY_RELEASE) + endif(MSVC) + + # kdelibs/win/ has to be built before the rest of kdelibs/ + # eventually it will be moved out from kdelibs/ + if (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) + set(KDEWIN32_FOUND TRUE) + # add needed system libs + set(KDEWIN32_LIBRARIES ${KDEWIN32_LIBRARY} user32 shell32 ws2_32) + + if (MINGW) + #mingw compiler + set(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_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(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${MSSDK_DIR}) + endif (MINGW) + + endif (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) + # required for configure + set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${KDEWIN32_INCLUDES}) + set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${KDEWIN32_LIBRARIES}) - endif (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) + endif (NOT KDEWIN32_DIR) if (KDEWIN32_FOUND) if (NOT KDEWIN32_FIND_QUIETLY) - message(STATUS "Found KDEWIN32: ${KDEWIN32_LIBRARY}") + message(STATUS "Found kdewin32 library: ${KDEWIN32_LIBRARY}") endif (NOT KDEWIN32_FIND_QUIETLY) + else (KDEWIN32_FOUND) if (KDEWIN32_FIND_REQUIRED) message(FATAL_ERROR "Could NOT find KDEWIN32 library\nPlease install it first") endif (KDEWIN32_FIND_REQUIRED) endif (KDEWIN32_FOUND) - - # add include path and library to all targets, this is required because - # cmake's 2.4.6 FindZLib.cmake does not use CMAKE_REQUIRED... vars - set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${KDEWIN32_INCLUDES}) - set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${KDEWIN32_DIR}/lib) - - set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${KDEWIN32_INCLUDES}) - set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${KDEWIN32_LIBRARIES}) - endif (WIN32) -- cgit v1.2.1 From c6ad4ece89f2b5437f0017a815d2c1ec8c3d9cd0 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Fri, 8 Jun 2007 16:54:51 +0000 Subject: SVN_SILENT typo svn path=/trunk/KDE/kdelibs/; revision=672975 --- modules/FindKDEWIN32.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 17eab61d..0bacd3fa 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -44,7 +44,7 @@ if (WIN32) if(MSVC) find_library(KDEWIN32_LIBRARY_DEBUG NAMES kdewin32d PATHS - ${CMAKE_LIBRARY_PATH + ${CMAKE_LIBRARY_PATH} ${CMAKE_INSTALL_PREFIX}/lib NO_SYSTEM_ENVIRONMENT_PATH ) -- cgit v1.2.1 From 7f040e43ab1778150bac0c305104ff6a5ad86676 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Thu, 19 Jul 2007 20:06:53 +0000 Subject: - fixed comments - added /win32libs to KDEWIN search svn path=/trunk/KDE/kdelibs/; revision=690003 --- modules/FindKDEWIN32.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 0bacd3fa..68a2f68a 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -1,4 +1,4 @@ -# - Try to find the directory in which the kdewin32 library and other win32 related libraries lives +# - Try to find the KDEWIN32 library # # Once done this will define # -- cgit v1.2.1 From 0e93aecc9d6e8736fa9b2bf0b9a8c6adc30e6337 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Mon, 24 Sep 2007 10:53:59 +0000 Subject: switch to new macro FIND_LIBRARY_EX() to avoid code duplication svn path=/trunk/KDE/kdelibs/; revision=716254 --- modules/FindKDEWIN32.cmake | 43 +++++-------------------------------------- 1 file changed, 5 insertions(+), 38 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 68a2f68a..de3f25d6 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -14,6 +14,8 @@ if (WIN32) + include(FindLibraryEx) + if (NOT KDEWIN32_DIR) if(NOT KDEWIN_FOUND) find_package(KDEWIN REQUIRED) @@ -26,50 +28,15 @@ if (WIN32) # search for kdewin32 in the default install directory for applications (default of (n)make install) - find_library(KDEWIN32_LIBRARY_DEBUG NAMES kdewin32d + find_library_ex(KDEWIN32_LIBRARY + WIN32_DEBUG_POSTFIX d + NAMES kdewin32 PATHS ${CMAKE_LIBRARY_PATH} ${CMAKE_INSTALL_PREFIX}/lib NO_SYSTEM_ENVIRONMENT_PATH ) - find_library(KDEWIN32_LIBRARY_RELEASE NAMES kdewin32 - PATHS - ${CMAKE_LIBRARY_PATH} - ${CMAKE_INSTALL_PREFIX}/lib - NO_SYSTEM_ENVIRONMENT_PATH - ) - - # msvc makes a difference between debug and release - if(MSVC) - find_library(KDEWIN32_LIBRARY_DEBUG NAMES kdewin32d - PATHS - ${CMAKE_LIBRARY_PATH} - ${CMAKE_INSTALL_PREFIX}/lib - NO_SYSTEM_ENVIRONMENT_PATH - ) - if(MSVC_IDE) - # the ide needs the debug and release version - if( NOT KDEWIN32_LIBRARY_DEBUG OR NOT KDEWIN32_LIBRARY_RELEASE) - message(FATAL_ERROR "\nCould NOT find the debug AND release version of the KDEWIN32 library.\nYou need to have both to use MSVC projects.\nPlease build and install both kdelibs/win/ libraries first.\n") - endif( NOT KDEWIN32_LIBRARY_DEBUG OR NOT KDEWIN32_LIBRARY_RELEASE) - SET(KDEWIN32_LIBRARY optimized ${KDEWIN32_LIBRARY_RELEASE} debug ${KDEWIN32_LIBRARY_DEBUG}) - else(MSVC_IDE) - string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) - if(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_DEBUG}) - else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_RELEASE}) - endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - endif(MSVC_IDE) - else(MSVC) - if(KDEWIN32_LIBRARY_RELEASE) - set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_RELEASE}) - else(KDEWIN32_LIBRARY_RELEASE) - set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_DEBUG}) - endif(KDEWIN32_LIBRARY_RELEASE) - endif(MSVC) - # kdelibs/win/ has to be built before the rest of kdelibs/ # eventually it will be moved out from kdelibs/ if (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) -- cgit v1.2.1 From faf712102ec52da6d01b2d492edfd5fa60efbba5 Mon Sep 17 00:00:00 2001 From: Bernhard Loos Date: Mon, 24 Sep 2007 17:46:54 +0000 Subject: some more needed libraries for the KUser port svn path=/trunk/KDE/kdelibs/; revision=716430 --- modules/FindKDEWIN32.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index de3f25d6..e6d044d7 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -42,7 +42,7 @@ if (WIN32) if (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) set(KDEWIN32_FOUND TRUE) # add needed system libs - set(KDEWIN32_LIBRARIES ${KDEWIN32_LIBRARY} user32 shell32 ws2_32) + set(KDEWIN32_LIBRARIES ${KDEWIN32_LIBRARY} user32 shell32 ws2_32 netapi32 userenv) if (MINGW) #mingw compiler -- cgit v1.2.1 From b94768531ef8881f2b6e7b93c4f0324f02b80487 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sun, 30 Sep 2007 16:19:18 +0000 Subject: FIND_LIBRARY_EX -> FIND_LIBRARY_WITH_DEBUG svn path=/trunk/KDE/kdelibs/; revision=719224 --- modules/FindKDEWIN32.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index e6d044d7..5d4499af 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -14,21 +14,21 @@ if (WIN32) - include(FindLibraryEx) + include(FindLibraryWithDebug) if (NOT KDEWIN32_DIR) if(NOT KDEWIN_FOUND) find_package(KDEWIN REQUIRED) endif(NOT KDEWIN_FOUND) - find_path(KDEWIN32_INCLUDE_DIR winposix_export.h + find_path(KDEWIN32_INCLUDE_DIR winposix_export.h ${CMAKE_INCLUDE_PATH} ${CMAKE_INSTALL_PREFIX}/include ) # search for kdewin32 in the default install directory for applications (default of (n)make install) - find_library_ex(KDEWIN32_LIBRARY + find_library_with_debug(KDEWIN32_LIBRARY WIN32_DEBUG_POSTFIX d NAMES kdewin32 PATHS -- cgit v1.2.1 From 2a0027066fd35c328cf6e41598a883bf9d135bd6 Mon Sep 17 00:00:00 2001 From: Patrick Spendrin Date: Wed, 7 Nov 2007 20:48:28 +0000 Subject: adding icon install macro from kdewin-installer/marble svn path=/trunk/KDE/kdelibs/; revision=734021 --- modules/FindKDEWIN32.cmake | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 5d4499af..b69f0beb 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -71,4 +71,29 @@ if (WIN32) message(FATAL_ERROR "Could NOT find KDEWIN32 library\nPlease install it first") endif (KDEWIN32_FIND_REQUIRED) endif (KDEWIN32_FOUND) + MACRO (KDE_ADD_RESOURCES2 outfiles ) + + FOREACH (it ${ARGN}) + GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE) + GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE) + GET_FILENAME_COMPONENT(rc_path ${infile} PATH) + SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfilename}_res.o) + # parse file for dependencies + FILE(READ "${infile}" _RC_FILE_CONTENTS) + STRING(REGEX MATCHALL "[^<]*" _RC_FILES "${_RC_FILE_CONTENTS}") + SET(_RC_DEPENDS) + FOREACH(_RC_FILE ${_RC_FILES}) + STRING(REGEX REPLACE "^" "" _RC_FILE "${_RC_FILE}") + SET(_RC_DEPENDS ${_RC_DEPENDS} "${rc_path}/${_RC_FILE}") + ENDFOREACH(_RC_FILE) + ADD_CUSTOM_COMMAND(OUTPUT ${outfile} + COMMAND windres + ARGS -i ${infile} -o ${outfile} --include-dir=${CMAKE_CURRENT_SOURCE_DIR} + MAIN_DEPENDENCY ${infile} + DEPENDS ${_RC_DEPENDS}) + SET(${outfiles} ${${outfiles}} ${outfile}) + ENDFOREACH (it) + + ENDMACRO (KDE_ADD_RESOURCES2) + endif (WIN32) -- cgit v1.2.1 From 90f3ffd45a28a5f86d09e8371aa4897b0d91a9f2 Mon Sep 17 00:00:00 2001 From: Patrick Spendrin Date: Fri, 9 Nov 2007 12:43:19 +0000 Subject: changing macro to just work in case of png2ico's existance - removing duplication from FindKDEWIN32.cmake svn path=/trunk/KDE/kdelibs/; revision=734634 --- modules/FindKDEWIN32.cmake | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index b69f0beb..5d4499af 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -71,29 +71,4 @@ if (WIN32) message(FATAL_ERROR "Could NOT find KDEWIN32 library\nPlease install it first") endif (KDEWIN32_FIND_REQUIRED) endif (KDEWIN32_FOUND) - MACRO (KDE_ADD_RESOURCES2 outfiles ) - - FOREACH (it ${ARGN}) - GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE) - GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE) - GET_FILENAME_COMPONENT(rc_path ${infile} PATH) - SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfilename}_res.o) - # parse file for dependencies - FILE(READ "${infile}" _RC_FILE_CONTENTS) - STRING(REGEX MATCHALL "[^<]*" _RC_FILES "${_RC_FILE_CONTENTS}") - SET(_RC_DEPENDS) - FOREACH(_RC_FILE ${_RC_FILES}) - STRING(REGEX REPLACE "^" "" _RC_FILE "${_RC_FILE}") - SET(_RC_DEPENDS ${_RC_DEPENDS} "${rc_path}/${_RC_FILE}") - ENDFOREACH(_RC_FILE) - ADD_CUSTOM_COMMAND(OUTPUT ${outfile} - COMMAND windres - ARGS -i ${infile} -o ${outfile} --include-dir=${CMAKE_CURRENT_SOURCE_DIR} - MAIN_DEPENDENCY ${infile} - DEPENDS ${_RC_DEPENDS}) - SET(${outfiles} ${${outfiles}} ${outfile}) - ENDFOREACH (it) - - ENDMACRO (KDE_ADD_RESOURCES2) - endif (WIN32) -- cgit v1.2.1 From 9b53104d3fe4dfdd7506ffd49e6195a65d514ba5 Mon Sep 17 00:00:00 2001 From: Andreas Pakulat Date: Fri, 21 Dec 2007 18:43:55 +0000 Subject: CMAKE_LIBRARY_PATH is AFAIK an environment variable and thus contains native paths, so convert them to cmake paths before handing them to find_library svn path=/trunk/KDE/kdelibs/; revision=751355 --- modules/FindKDEWIN32.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 5d4499af..7e9c36a5 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -27,12 +27,12 @@ if (WIN32) ) # search for kdewin32 in the default install directory for applications (default of (n)make install) - + FILE(TO_CMAKE_PATH "${CMAKE_LIBRARY_PATH}" _cmakeLibraryPathCmakeStyle) find_library_with_debug(KDEWIN32_LIBRARY WIN32_DEBUG_POSTFIX d NAMES kdewin32 PATHS - ${CMAKE_LIBRARY_PATH} + ${_cmakeLibraryPathCmakeStyle} ${CMAKE_INSTALL_PREFIX}/lib NO_SYSTEM_ENVIRONMENT_PATH ) -- cgit v1.2.1 From bd907b8e2cb7157986c9be4a8ff44792283869f5 Mon Sep 17 00:00:00 2001 From: Andreas Pakulat Date: Sat, 22 Dec 2007 23:30:06 +0000 Subject: Don't require FindKDEWIN to succeed, its just a convenience thing to not have to set CMAKE_INCLUDE_PATH and CMAKE_LIB_PATH when installing gnuwin32 libs into a "known" place (like C:\Program Files\win32libs). But that breaks things like emerge which already set the two variables and thus don't set KDEWIN_DIR and don't need to set it. If the convenience thing isn't needed FindKDEWIN.cmake can be removed completely CCMAIL:kde-windows@kde.org svn path=/trunk/KDE/kdelibs/; revision=751844 --- modules/FindKDEWIN32.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 7e9c36a5..aa62f649 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -18,7 +18,7 @@ if (WIN32) if (NOT KDEWIN32_DIR) if(NOT KDEWIN_FOUND) - find_package(KDEWIN REQUIRED) + find_package(KDEWIN) endif(NOT KDEWIN_FOUND) find_path(KDEWIN32_INCLUDE_DIR winposix_export.h -- cgit v1.2.1 From 814455b7ad321c88e730662fda58261087b72e72 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 18 Feb 2008 19:06:32 +0000 Subject: some improvements to the docs: -some modules were not at all documented, only few are left now -the copyright message doesn't have to be printed for every module in the docs -fix FindKorundom.cmake, it didn't follow the style guide and had typos (e.g. Korumdum_FOUND instead of KORUNDUM_FOUND) Alex (will commit modified FindKDE4Internal.cmake after Christians commit) svn path=/trunk/KDE/kdelibs/; revision=776742 --- modules/FindKDEWIN32.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index aa62f649..589b1531 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -5,7 +5,7 @@ # 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, Ralf Habacker, # -- cgit v1.2.1 From feebc3c9de4b839403de3c96d86822eeaf6d4182 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Fri, 8 Aug 2008 20:50:36 +0000 Subject: limit KDEWIN_LIBRARIES to the library identified by the recent cmake build type - the new link interface of cmake 2.6.x does not support the optimized/debug library prefixes, using them results for example into kde4-config link error not finding 'optimized' library. svn path=/trunk/KDE/kdelibs/; revision=844126 --- modules/FindKDEWIN32.cmake | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 589b1531..79c66dc6 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -14,8 +14,6 @@ if (WIN32) - include(FindLibraryWithDebug) - if (NOT KDEWIN32_DIR) if(NOT KDEWIN_FOUND) find_package(KDEWIN) @@ -28,9 +26,15 @@ if (WIN32) # search for kdewin32 in the default install directory for applications (default of (n)make install) FILE(TO_CMAKE_PATH "${CMAKE_LIBRARY_PATH}" _cmakeLibraryPathCmakeStyle) - find_library_with_debug(KDEWIN32_LIBRARY - WIN32_DEBUG_POSTFIX d - NAMES kdewin32 + + if (CMAKE_BUILD_TYPE STREQUAL "Debug") + set (LIBRARY_NAME kdewin32d) + else (CMAKE_BUILD_TYPE STREQUAL "Debug") + set (LIBRARY_NAME kdewin32) + endif (CMAKE_BUILD_TYPE STREQUAL "Debug") + + find_library(KDEWIN32_LIBRARY + NAMES ${LIBRARY_NAME} PATHS ${_cmakeLibraryPathCmakeStyle} ${CMAKE_INSTALL_PREFIX}/lib -- cgit v1.2.1 From 2186f87998b7a1d8f1d87809eb8fb758f0843507 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Fri, 8 Aug 2008 20:53:38 +0000 Subject: updated doc svn path=/trunk/KDE/kdelibs/; revision=844128 --- modules/FindKDEWIN32.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 79c66dc6..d22a85a7 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -7,7 +7,7 @@ # KDEWIN32_LIBRARIES - The libraries needed to use KDEWIN32 # Copyright (c) 2006, Alexander Neundorf, -# Copyright (c) 2007, Ralf Habacker, +# Copyright (c) 2007-2008, Ralf Habacker, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -41,8 +41,6 @@ if (WIN32) NO_SYSTEM_ENVIRONMENT_PATH ) - # kdelibs/win/ has to be built before the rest of kdelibs/ - # eventually it will be moved out from kdelibs/ if (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) set(KDEWIN32_FOUND TRUE) # add needed system libs -- cgit v1.2.1 From e34ca7a9480b9dd714cec2f8a0e58c1f731bf25a Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Thu, 4 Dec 2008 13:13:40 +0000 Subject: removed references to the obsolate KDEWIN package svn path=/trunk/KDE/kdelibs/; revision=892482 --- modules/FindKDEWIN32.cmake | 3 --- 1 file changed, 3 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') 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} -- cgit v1.2.1 From ad016366d75d46d029b469ba8073cbf8c0fec113 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Wed, 10 Jun 2009 08:56:30 +0000 Subject: uses new kdewin library first, only when not found the old kdewin32 library svn path=/trunk/KDE/kdelibs/; revision=979583 --- modules/FindKDEWIN32.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index abbff19e..ec6ac8fa 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -25,9 +25,9 @@ if (WIN32) FILE(TO_CMAKE_PATH "${CMAKE_LIBRARY_PATH}" _cmakeLibraryPathCmakeStyle) if (CMAKE_BUILD_TYPE STREQUAL "Debug") - set (LIBRARY_NAME kdewin32d) + set (LIBRARY_NAME kdewind kdewin32d) else (CMAKE_BUILD_TYPE STREQUAL "Debug") - set (LIBRARY_NAME kdewin32) + set (LIBRARY_NAME kdewin kdewin32) endif (CMAKE_BUILD_TYPE STREQUAL "Debug") find_library(KDEWIN32_LIBRARY -- cgit v1.2.1 From 98b828d70a0d23c5de29b30854685a9252b7762d Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Mon, 15 Jun 2009 13:31:38 +0000 Subject: minor fix for finding the kdewin package svn path=/trunk/KDE/kdelibs/; revision=982307 --- modules/FindKDEWIN32.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index ec6ac8fa..6ed0492c 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -16,7 +16,7 @@ if (WIN32) if (NOT KDEWIN32_DIR) - find_path(KDEWIN32_INCLUDE_DIR winposix_export.h + find_path(KDEWIN32_INCLUDE_DIR kdewin_export.h winposix_export.h ${CMAKE_INCLUDE_PATH} ${CMAKE_INSTALL_PREFIX}/include ) -- cgit v1.2.1 From 6962f4ad4ba904ce99398af174de6fbb06bb9be9 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Tue, 16 Jun 2009 06:43:45 +0000 Subject: renamed kdewin32 to kdewin to have a more generic name, approved by kde-buildsystem list svn path=/trunk/KDE/kdelibs/; revision=982530 --- modules/FindKDEWIN32.cmake | 67 +++++++--------------------------------------- 1 file changed, 10 insertions(+), 57 deletions(-) (limited to 'modules/FindKDEWIN32.cmake') diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index 6ed0492c..1f78055b 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -1,4 +1,5 @@ # - Try to find the KDEWIN32 library +# - Try to find the KDEWIN32 library - deprecated # # Once done this will define # @@ -7,67 +8,19 @@ # KDEWIN32_LIBRARIES - The libraries needed to use KDEWIN32 # Copyright (c) 2006, Alexander Neundorf, -# Copyright (c) 2007-2008, Ralf Habacker, +# 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 KDEWIN32_DIR) - - find_path(KDEWIN32_INCLUDE_DIR kdewin_export.h winposix_export.h - ${CMAKE_INCLUDE_PATH} - ${CMAKE_INSTALL_PREFIX}/include - ) - - # search for kdewin32 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 kdewin32d) - else (CMAKE_BUILD_TYPE STREQUAL "Debug") - set (LIBRARY_NAME kdewin kdewin32) - endif (CMAKE_BUILD_TYPE STREQUAL "Debug") - - find_library(KDEWIN32_LIBRARY - NAMES ${LIBRARY_NAME} - PATHS - ${_cmakeLibraryPathCmakeStyle} - ${CMAKE_INSTALL_PREFIX}/lib - NO_SYSTEM_ENVIRONMENT_PATH - ) - - if (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) - set(KDEWIN32_FOUND TRUE) - # add needed system libs - set(KDEWIN32_LIBRARIES ${KDEWIN32_LIBRARY} user32 shell32 ws2_32 netapi32 userenv) - - if (MINGW) - #mingw compiler - set(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_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(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${MSSDK_DIR}) - endif (MINGW) - - endif (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) - # required for configure - set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${KDEWIN32_INCLUDES}) - set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${KDEWIN32_LIBRARIES}) - - endif (NOT KDEWIN32_DIR) - - if (KDEWIN32_FOUND) - if (NOT KDEWIN32_FIND_QUIETLY) - message(STATUS "Found kdewin32 library: ${KDEWIN32_LIBRARY}") - endif (NOT KDEWIN32_FIND_QUIETLY) - - else (KDEWIN32_FOUND) - if (KDEWIN32_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find KDEWIN32 library\nPlease install it first") - endif (KDEWIN32_FIND_REQUIRED) - endif (KDEWIN32_FOUND) + 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 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/FindKDEWIN32.cmake | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 modules/FindKDEWIN32.cmake (limited to 'modules/FindKDEWIN32.cmake') 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) -- cgit v1.2.1 From b3b6fa673138519b3bea123e464ec1d9ca6ef915 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Thu, 18 Jun 2009 08:55:37 +0000 Subject: applied suggest change from alex on kde-commit svn path=/trunk/KDE/kdelibs/; revision=983398 --- modules/FindKDEWIN32.cmake | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 modules/FindKDEWIN32.cmake (limited to 'modules/FindKDEWIN32.cmake') 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