aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ehrlicher <ch.ehrlicher@gmx.de>2006-10-22 13:47:29 +0000
committerChristian Ehrlicher <ch.ehrlicher@gmx.de>2006-10-22 13:47:29 +0000
commit6ed3895dfc8904066d2dd0674035f5618709722a (patch)
tree3e5e0a017701826c50b8b74c8115fb6f7b7f0b6b
parent2ca2be2793edf9bd3f0570a600e9f2d0f1acd0c7 (diff)
downloadextra-cmake-modules-6ed3895dfc8904066d2dd0674035f5618709722a.tar.gz
extra-cmake-modules-6ed3895dfc8904066d2dd0674035f5618709722a.tar.bz2
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
-rw-r--r--modules/FindKDEWIN32.cmake7
1 files changed, 2 insertions, 5 deletions
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