diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-02-03 22:00:11 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-02-03 22:00:11 +0000 |
| commit | 0f0ed599605523734c61287f9e2f68061b068951 (patch) | |
| tree | 60d11b8432a1bb13c6f1eb5a56f5a01c1b47fc77 /modules/KDE4Macros.cmake | |
| parent | ec20af3748c658bd51630c39a4426950b9ca8270 (diff) | |
| download | extra-cmake-modules-0f0ed599605523734c61287f9e2f68061b068951.tar.gz extra-cmake-modules-0f0ed599605523734c61287f9e2f68061b068951.tar.bz2 | |
-major overhaul of the windows stuff: kdelibs/win/ is now built as a regular part of the build process
-an improved version of CheckIncludeFiles.cmake has been added, which takes additional include directories as argument
-the check for the KDE4_LIB_DIR was wrong, it returned libkxmlcore.so instead of the directory
-fix the header install commands for the win/include/ stuff
Alex
svn path=/trunk/KDE/kdelibs/; revision=505455
Diffstat (limited to 'modules/KDE4Macros.cmake')
| -rw-r--r-- | modules/KDE4Macros.cmake | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 91ded6d4..682eae4c 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -431,24 +431,34 @@ MACRO(KDE4_ADD_PLUGIN _target_NAME _with_PREFIX) SET_TARGET_PROPERTIES(${_target_NAME} PROPERTIES PREFIX "") ENDIF(_first_SRC) +# IF (UNIX) + # I guess under windows the libtool file are not required KDE4_CREATE_LIBTOOL_FILE(${_target_NAME}) +# ENDIF (UNIX) ENDMACRO(KDE4_ADD_PLUGIN _target_NAME _with_PREFIX) MACRO(KDE4_ADD_KLM _target_NAME ) - IF (KDE4_ENABLE_FINAL) - KDE4_CREATE_FINAL_FILES(${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c ${ARGN}) - ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c) - ELSE (KDE4_ENABLE_FINAL) - ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${ARGN} ) + CONFIGURE_FILE(${KDE4_MODULE_DIR}/kde4init_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp) + + IF (WIN32) + # under windows, just build a normal executable + KDE4_ADD_EXECUTABLE(${_target_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ${ARGN} ) + ELSE (WIN32) + # under UNIX, create a shared library and a small executable, which links to this library + IF (KDE4_ENABLE_FINAL) + KDE4_CREATE_FINAL_FILES(${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c ${ARGN}) + ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c) + ELSE (KDE4_ENABLE_FINAL) + ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${ARGN} ) # MESSAGE(STATUS "klm: kdeinit_${_target_NAME}") - ENDIF (KDE4_ENABLE_FINAL) + ENDIF (KDE4_ENABLE_FINAL) - CONFIGURE_FILE(${KDE4_MODULE_DIR}/kde4init_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp) - ADD_EXECUTABLE( ${_target_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ) - TARGET_LINK_LIBRARIES( ${_target_NAME} kdeinit_${_target_NAME} ) + ADD_EXECUTABLE( ${_target_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ) + TARGET_LINK_LIBRARIES( ${_target_NAME} kdeinit_${_target_NAME} ) + ENDIF (WIN32) ENDMACRO(KDE4_ADD_KLM _target_NAME) |