KDE/kdelibs

[Ralf Habacker]

Alexander Neundorf schrieb:
> SVN commit 506879 by neundorf:
>
> -add -DMAKE_KDEWIN32_LIB to the build in kdelibs/win/
> -convert KDECORE_EXPORT in include/mingw to KDEWIN32_EXPORT, is this correct ?
>   
this should be similar to the msvc part. The only rule is that every 
include file in include/mingw/ should include sys/types.h if exports are 
required and that winposix_export.h is only included in sys/types.h

Ralf

> -use CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH in FindKDE4.cmake
>
> Alex
>
> CCMAIL: kde-buildsystem at kde.org
>
>
>
>  M  +4 -4      cmake/modules/FindKDE4.cmake  
>  M  +1 -0      win/CMakeLists.txt  
>  M  +4 -4      win/include/mingw/stdlib.h  
>  M  +0 -1      win/include/mingw/sys/types.h  
>
>
> --- trunk/KDE/kdelibs/cmake/modules/FindKDE4.cmake #506878:506879
> @@ -171,8 +171,8 @@
>  
>     
>     # at first find the kdewin32 library, this has to be compiled and installed before kdelibs/
> -   FIND_LIBRARY(KDEWIN32_LIBRARY NAMES kdewin32)
> -   FIND_PATH(KDEWIN32_INCLUDE_DIR winposix_export.h)
> +   FIND_LIBRARY(KDEWIN32_LIBRARY NAMES kdewin32 PATHS ${CMAKE_LIBRARY_PATH})
> +   FIND_PATH(KDEWIN32_INCLUDE_DIR winposix_export.h ${CMAKE_INCLUDE_PATH})
>       
>     # kdelibs/win/ has to be built before the rest of kdelibs/
>     # eventually it will be moved out from kdelibs/
> @@ -182,10 +182,10 @@
>     
>     IF(MINGW)
>        #mingw compiler
> -      SET(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/mingw ${QT_INCLUDES})
> +      SET(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/mingw ${QT_INCLUDES} ${CMAKE_INCLUDE_PATH})
>     ELSE(MINGW)
>        # msvc compiler
> -      SET(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/msvc  ${QT_INCLUDES} )
> +      SET(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/msvc  ${QT_INCLUDES}  ${CMAKE_INCLUDE_PATH})
>  
>        # add the MS SDK include directory if available
>        SET(MS_SDK_DIR $ENV{MSSdk})
> --- trunk/KDE/kdelibs/win/CMakeLists.txt #506878:506879
> @@ -72,6 +72,7 @@
>  
>  add_library(kdewin32 SHARED ${win_LIB_SRCS} )
>  target_link_libraries(kdewin32 ${QT_QTCORE_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ws2_32 )
> +set_target_properties(kdewin32 PROPERTIES DEFINE_SYMBOL MAKE_KDEWIN32_LIB )
>  set_target_properties(kdecore PROPERTIES VERSION 4.2.0 SOVERSION 4 )
>  
>  install_targets(/lib kdewin32 )
> --- trunk/KDE/kdelibs/win/include/mingw/stdlib.h #506878:506879
> @@ -47,10 +47,10 @@
>  #define EXIT_SUCCESS 0
>  */
>  /* from fakes.c */
> -KDECORE_EXPORT int setenv(const char *__string, const char *__value, int __overwrite);
> -KDECORE_EXPORT void unsetenv(const char *__string);
> -KDECORE_EXPORT int mkstemps (char* _template, int suffix_len);
> -KDECORE_EXPORT char* mkdtemp (char* _template);
> +KDEWIN32_EXPORT int setenv(const char *__string, const char *__value, int __overwrite);
> +KDEWIN32_EXPORT void unsetenv(const char *__string);
> +KDEWIN32_EXPORT int mkstemps (char* _template, int suffix_len);
> +KDEWIN32_EXPORT char* mkdtemp (char* _template);
>  
>  #ifdef __cplusplus
>  }
> --- trunk/KDE/kdelibs/win/include/mingw/sys/types.h #506878:506879
> @@ -34,7 +34,6 @@
>  #ifdef __cplusplus
>  #include <winposix_export.h>
>  #else
> -#define KDECORE_EXPORT
>  #define KDEWIN32_EXPORT
>  #endif 
>  
> _______________________________________________
> Kde-buildsystem mailing list
> Kde-buildsystem at kde.org
> https://mail.kde.org/mailman/listinfo/kde-buildsystem
>