alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

buildsystem: build always sharted libs, remove WINCE "support"

Browse Source 
Alex
This commit is contained in:
Alex Neundorf 2013-02-08 01:06:27 +01:00
parent 7b7bed53d7
commit c60345f4e5
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -144,19 +144,6 @@ endif()
################# configure checks and create the configured files #################
if(WINCE)
set(STATIC_LIBRARY ON)
add_definitions(-DSTATIC_INSTALL_PATH=L\\\"/programme/kde\\\")
endif()
if(STATIC_LIBRARY)
set(LIBRARY_TYPE STATIC)
add_definitions(-DKDELIBS_STATIC_LIBS)
message(STATUS "Building kdelibs as static libraries")
else()
set(LIBRARY_TYPE SHARED)
endif()
# now create config headers
configure_file(config-prefix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-prefix.h )
configure_file(config-compiler.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-compiler.h )

4
plasma/CMakeLists.txt
View File

@ -179,10 +179,10 @@ kde4_add_ui_files(plasma_LIB_SRCS
#)
kde4_add_library(plasma ${LIBRARY_TYPE} ${plasma_LIB_SRCS})
kde4_add_library(plasma SHARED ${plasma_LIB_SRCS})
target_link_libraries(plasma ${QT_QTUITOOLS_LIBRARY}
${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY}
${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY}
${KDE4_KDEUI_LIBS} kdnssd KF5::threadweaver kauth KF5::kwindowsystem ${PLASMA_EXTRA_LIBS} kcoreaddons ki18n)
#FIXME gpgme++ is in kdepimlibs, neeeds to be elsewhere
target_link_libraries(plasma ${KDEPIMLIBS_GPGMEPP_LIBS} kdeclarative KF5::karchive)

2
plasma/private/qtjolie-branch/qtjolie/CMakeLists.txt
View File

@ -20,7 +20,7 @@ set(qtjolie_LIB_SRCS
serverthread.cpp
)
kde4_add_library(QtJolie ${LIBRARY_TYPE} ${qtjolie_LIB_SRCS})
kde4_add_library(QtJolie SHARED ${qtjolie_LIB_SRCS})
target_link_libraries(QtJolie ${QT_QTNETWORK_LIBRARY})