mirror of
https://invent.kde.org/network/krfb
synced 2024-07-03 08:28:35 +00:00
Not necessary to create static lib (which create some pb on x86_64)
svn path=/trunk/KDE/kdenetwork/krfb/; revision=626017
This commit is contained in:
parent
23d5c0008f
commit
f16e3cdf4c
|
@ -1,6 +1,41 @@
|
|||
add_subdirectory(srvloc)
|
||||
set(vncserver_SRCS
|
||||
${CMAKE_SOURCE_DIR}/krfb/libvncserver/main.c
|
||||
${CMAKE_SOURCE_DIR}/krfb/libvncserver/rfbserver.c
|
||||
${CMAKE_SOURCE_DIR}/krfb/libvncserver/sraRegion.c
|
||||
${CMAKE_SOURCE_DIR}/krfb/libvncserver/auth.c
|
||||
${CMAKE_SOURCE_DIR}/krfb/libvncserver/sockets.c
|
||||
${CMAKE_SOURCE_DIR}/krfb/libvncserver/stats.c
|
||||
${CMAKE_SOURCE_DIR}/krfb/libvncserver/corre.c
|
||||
${CMAKE_SOURCE_DIR}/krfb/libvncserver/hextile.c
|
||||
${CMAKE_SOURCE_DIR}/krfb/libvncserver/rre.c
|
||||
${CMAKE_SOURCE_DIR}/krfb/libvncserver/translate.c
|
||||
${CMAKE_SOURCE_DIR}/krfb/libvncserver/cutpaste.c
|
||||
${CMAKE_SOURCE_DIR}/krfb/libvncserver/zlib.c
|
||||
${CMAKE_SOURCE_DIR}/krfb/libvncserver/tight.c
|
||||
${CMAKE_SOURCE_DIR}/krfb/libvncserver/httpd.c
|
||||
${CMAKE_SOURCE_DIR}/krfb/libvncserver/cursor.c
|
||||
${CMAKE_SOURCE_DIR}/krfb/libvncserver/font.c
|
||||
${CMAKE_SOURCE_DIR}/krfb/libvncserver/draw.c
|
||||
${CMAKE_SOURCE_DIR}/krfb/libvncserver/selbox.c
|
||||
${CMAKE_SOURCE_DIR}/krfb/libvncserver/d3des.c
|
||||
${CMAKE_SOURCE_DIR}/krfb/libvncserver/vncauth.c
|
||||
${CMAKE_SOURCE_DIR}/krfb/libvncserver/cargs.c)
|
||||
|
||||
set(srvloc_SRCS
|
||||
${CMAKE_SOURCE_DIR}/krfb/srvloc/kinetinterface.cpp
|
||||
${CMAKE_SOURCE_DIR}/krfb/srvloc/uuid.cpp
|
||||
${CMAKE_SOURCE_DIR}/krfb/srvloc/getifaddrs.cpp
|
||||
${CMAKE_SOURCE_DIR}/krfb/srvloc/kserviceregistry.cpp
|
||||
${CMAKE_SOURCE_DIR}/krfb/srvloc/kinetinterfacewatcher.cpp)
|
||||
|
||||
set(krfbconfig_SRCS
|
||||
${CMAKE_SOURCE_DIR}/krfb/krfb/configuration.cc
|
||||
${CMAKE_SOURCE_DIR}/krfb/krfb/invitedialog.cc
|
||||
${CMAKE_SOURCE_DIR}/krfb/krfb/invitation.cc
|
||||
${CMAKE_SOURCE_DIR}/krfb/krfb/personalinvitedialog.cc)
|
||||
|
||||
|
||||
# add_subdirectory(kinetd)
|
||||
add_subdirectory(libvncserver)
|
||||
add_subdirectory(kcm_krfb)
|
||||
add_subdirectory(krfb)
|
||||
add_subdirectory(krfb_httpd)
|
||||
|
|
|
@ -1,14 +1,18 @@
|
|||
include_directories(${CMAKE_BINARY_DIR}/krfb/krfb/)
|
||||
include_directories(${CMAKE_BINARY_DIR}/krfb/krfb/ ${CMAKE_SOURCE_DIR}/krfb/srvloc/)
|
||||
|
||||
set(kcm_krfb_PART_SRCS kcm_krfb.cpp)
|
||||
set(kcm_krfb_PART_SRCS kcm_krfb.cpp ${srvloc_SRCS} ${krfbconfig_SRCS})
|
||||
|
||||
kde4_automoc(${kcm_krfb_PART_SRCS})
|
||||
|
||||
kde4_add_ui3_files(kcm_krfb_PART_SRCS configurationwidget.ui)
|
||||
kde4_add_ui3_files(kcm_krfb_PART_SRCS
|
||||
${CMAKE_SOURCE_DIR}/krfb/krfb/manageinvitations.ui
|
||||
${CMAKE_SOURCE_DIR}/krfb/krfb/personalinvitewidget.ui
|
||||
${CMAKE_SOURCE_DIR}/krfb/krfb/invitewidget.ui)
|
||||
|
||||
kde4_add_plugin(kcm_krfb ${kcm_krfb_PART_SRCS})
|
||||
|
||||
target_link_libraries(kcm_krfb ${KDE4_KDECORE_LIBS} libkrfbconfig libsrvloc ${KDE4_KDE3SUPPORT_LIBS})
|
||||
target_link_libraries(kcm_krfb ${KDE4_KDECORE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${SLP_LIBRARIES})
|
||||
|
||||
install(TARGETS kcm_krfb DESTINATION ${PLUGIN_INSTALL_DIR})
|
||||
|
||||
|
|
|
@ -2,30 +2,8 @@ project(krfb)
|
|||
|
||||
include_directories(${CMAKE_SOURCE_DIR}/krfb/libvncserver ${CMAKE_SOURCE_DIR}/krfb/srvloc)
|
||||
|
||||
########### config lib ###############
|
||||
|
||||
set(libkrfbconfig_SRCS
|
||||
configuration.cc
|
||||
invitedialog.cc
|
||||
invitation.cc
|
||||
personalinvitedialog.cc)
|
||||
|
||||
kde4_add_ui3_files(libkrfbconfig_SRCS
|
||||
manageinvitations.ui
|
||||
personalinvitewidget.ui
|
||||
invitewidget.ui)
|
||||
|
||||
kde4_automoc(${libkrfbconfig_SRCS})
|
||||
|
||||
kde4_add_library(libkrfbconfig ${libkrfbconfig_SRCS})
|
||||
|
||||
target_link_libraries(libkrfbconfig)
|
||||
|
||||
install(TARGETS libkrfbconfig DESTINATION ${LIB_INSTALL_DIR})
|
||||
|
||||
########### /config lib ###############
|
||||
|
||||
set(krfb_SRCS
|
||||
set(krfb_SRCS ${vncserver_SRCS} ${srvloc_SRCS} ${krfbconfig_SRCS}
|
||||
rfbcontroller.cc
|
||||
xupdatescanner.cc
|
||||
main.cpp
|
||||
|
@ -35,14 +13,17 @@ set(krfb_SRCS
|
|||
|
||||
kde4_automoc(${krfb_SRCS})
|
||||
|
||||
kde4_add_ui3_files(krfb_SRCS connectionwidget.ui)
|
||||
kde4_add_ui3_files(krfb_SRCS connectionwidget.ui
|
||||
manageinvitations.ui
|
||||
personalinvitewidget.ui
|
||||
invitewidget.ui)
|
||||
|
||||
message(STATUS "Port krfb to DBUS")
|
||||
# kde4_add_dcop_skels(krfb_SRCS krfbiface.h )
|
||||
|
||||
kde4_add_executable(krfb ${krfb_SRCS})
|
||||
|
||||
target_link_libraries(krfb ${KDE4_KIO_LIBS} ${KDE4_KDE3SUPPORT_LIBS} libkrfbconfig libvncserver libsrvloc ${JPEG_LIBRARIES})
|
||||
target_link_libraries(krfb ${KDE4_KIO_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${JPEG_LIBRARIES} ${SLP_LIBRARIES})
|
||||
|
||||
install(TARGETS krfb DESTINATION ${BIN_INSTALL_DIR})
|
||||
|
||||
|
@ -54,3 +35,4 @@ install(FILES eyes-open24.png eyes-closed24.png connection-side-image.png DESTIN
|
|||
install(FILES kinetd_krfb.desktop DESTINATION ${SERVICES_INSTALL_DIR})
|
||||
|
||||
kde4_install_icons(${ICON_INSTALL_DIR})
|
||||
|
||||
|
|
|
@ -1,28 +0,0 @@
|
|||
set(libvncserver_SRCS
|
||||
main.c
|
||||
rfbserver.c
|
||||
sraRegion.c
|
||||
auth.c
|
||||
sockets.c
|
||||
stats.c
|
||||
corre.c
|
||||
hextile.c
|
||||
rre.c
|
||||
translate.c
|
||||
cutpaste.c
|
||||
zlib.c
|
||||
tight.c
|
||||
httpd.c
|
||||
cursor.c
|
||||
font.c
|
||||
draw.c
|
||||
selbox.c
|
||||
d3des.c
|
||||
vncauth.c
|
||||
cargs.c)
|
||||
|
||||
kde4_add_library(libvncserver ${libvncserver_SRCS})
|
||||
|
||||
target_link_libraries(libvncserver)
|
||||
|
||||
install(TARGETS libvncserver DESTINATION ${LIB_INSTALL_DIR})
|
|
@ -1,19 +0,0 @@
|
|||
set(libsrvloc_SRCS
|
||||
kinetinterface.cpp
|
||||
kinetinterfacewatcher.h
|
||||
uuid.cpp
|
||||
getifaddrs.cpp
|
||||
kinetinterface.h
|
||||
kserviceregistry.cpp
|
||||
uuid.h
|
||||
getifaddrs.h
|
||||
kinetinterfacewatcher.cpp
|
||||
kserviceregistry.h)
|
||||
|
||||
kde4_automoc(${libsrvloc_SRCS})
|
||||
|
||||
kde4_add_library(libsrvloc ${libsrvloc_SRCS})
|
||||
|
||||
target_link_libraries(libsrvloc ${KDE4_KDECORE_LIBS} ${SLP_LIBRARIES})
|
||||
|
||||
install(TARGETS libsrvloc DESTINATION ${LIB_INSTALL_DIR})
|
Loading…
Reference in New Issue
Block a user