[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2006-01-31 21:50:08
Message-ID: 1138744208.750595.31706.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 504372 by neundorf:

-DLEAN_AND_MEAN for windows
-search for kdewin32 library on windows

Alex




 M  +5 -1      cmake/modules/FindKDE4.cmake  
 M  +1 -1      win/CMakeLists.txt  


--- trunk/KDE/kdelibs/cmake/modules/FindKDE4.cmake #504371:504372
@@ -53,7 +53,11 @@
 ENDIF(MINGW)
 
 IF(MSVC)
-   MESSAGE(FATAL_ERROR "Support for MSVC is not yet implemented, please edit \
FindKDE4.cmake to enable it") +   FIND_LIBRARY(KDE4_KDEWIN32_LIBRARY NAMES kdewin32)
+   IF (NOT KDE4_WIN32_LIBRARY)
+      MESSAGE(FATAL_ERROR "Could not find kdewin32 library, make sure to build and \
install kdelibs/win/ first" ) +   ENDIF (NOT KDE4_WIN32_LIBRARY)
+   SET(QT_AND_KDECORE_LIBS ${QT_AND_KDECORE_LIBS} ${KDE4_KDEWIN32_LIBRARY})
 ENDIF(MSVC)
 
 
--- trunk/KDE/kdelibs/win/CMakeLists.txt #504371:504372
@@ -25,7 +25,7 @@
    # we are using msvc, so do whatever required for msvc
    include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/include/msvc )
    # is this also required for mingw ?
-   add_definitions(-D_WINSOCKAPI_)
+   add_definitions(-D_WINSOCKAPI_ -DWIN32_LEAN_AND_MEAN)
    # find the headers for msvc
    file(GLOB_RECURSE _tmp_headers include/msvc/*.h)
 endif(MINGW)


[prev in list] [next in list] [prev in thread] [next in thread]