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

List:       kde-commits
Subject:    KDE/kdenetwork/krfb
From:       George Goldberg <grundleborg () googlemail ! com>
Date:       2009-11-24 10:42:05
Message-ID: 1259059325.331104.13095.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1053592 by gberg:

Make libkrfb more obviously a private library.
It is meant to be used only by plugins built together with krfb, and does not make \
any binary compatability at all. It should not be linked against by anything outside \
of the krfb source tree, so we definitely shouldn't be installing headers.

 M  +7 -21     CMakeLists.txt  
 M  +1 -1      framebuffers/qt/CMakeLists.txt  
 M  +1 -1      framebuffers/x11/CMakeLists.txt  


--- trunk/KDE/kdenetwork/krfb/CMakeLists.txt #1053591:1053592
@@ -20,45 +20,31 @@
 # First target: libkrfb - a library
 # for linking plugins against.
 
-set (libkrfb_SRCS
+set (krfbprivate_SRCS
      framebuffer.cpp
      framebufferplugin.cpp
 )
 
-set (libkrfb_HDRS
-     framebuffer.h
-     framebufferplugin.h
-)
-
-kde4_add_library (libkrfb
+kde4_add_library (krfbprivate
                   SHARED
-                  ${libkrfb_SRCS}
+                  ${krfbprivate_SRCS}
 )
 
-target_link_libraries (libkrfb
+target_link_libraries (krfbprivate
                        ${QT_QTCORE_LIBRARY}
                        ${QT_QTGUI_LIBRARY}
                        ${X11_X11_LIB}
 )
 
-# This is needed because otherwise we have two targets called krfb (application and \
                library)
-set_target_properties (libkrfb PROPERTIES
-                       OUTPUT_NAME krfb
-)
-
-set_target_properties (libkrfb PROPERTIES
+set_target_properties (krfbprivate PROPERTIES
                        VERSION ${GENERIC_LIB_VERSION}
                        SOVERSION ${GENERIC_LIB_VERSION}
 )
 
-install (TARGETS libkrfb
+install (TARGETS krfbprivate
          ${INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
-install (FILES ${libkrfb_HDRS}
-         DESTINATION ${INCLUDE_INSTALL_DIR}/KRfb
-)
-
 install (FILES
          krfb-framebuffer.desktop
          DESTINATION ${SERVICETYPES_INSTALL_DIR}
@@ -102,7 +88,7 @@
 kde4_add_executable(krfb ${krfb_SRCS})
 
 target_link_libraries(krfb
-                      libkrfb
+                      krfbprivate
                       ${JPEG_LIBRARIES}
                       ${LIBVNCSERVER_LIBRARIES}
                       ${X11_Xext_LIB}
--- trunk/KDE/kdenetwork/krfb/framebuffers/qt/CMakeLists.txt #1053591:1053592
@@ -15,7 +15,7 @@
                        ${QT_QTCORE_LIBRARY}
                        ${QT_QTGUI_LIBRARY}
                        ${KDE4_KDEUI_LIBS}
-                       libkrfb
+                       krfbprivate
 )
 
 install (TARGETS krfb_framebuffer_qt
--- trunk/KDE/kdenetwork/krfb/framebuffers/x11/CMakeLists.txt #1053591:1053592
@@ -18,7 +18,7 @@
                        ${X11_X11_LIB}
                        ${X11_Xdamage_LIB}
                        ${X11_Xext_LIB}
-                       libkrfb
+                       krfbprivate
 )
 
 install (TARGETS krfb_framebuffer_x11


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