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

List:       kde-commits
Subject:    KDE/kdebase
From:       Hasso Tepper <hasso () kde ! org>
Date:       2008-10-13 10:12:15
Message-ID: 1223892735.834220.24136.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 870788 by hasso:

Fix compile on systems without libdl.so like all BSD's.


 M  +8 -2      apps/kinfocenter/opengl/CMakeLists.txt  
 M  +6 -1      workspace/kcontrol/screensaver/CMakeLists.txt  
 M  +8 -1      workspace/krunner/lock/CMakeLists.txt  


--- trunk/KDE/kdebase/apps/kinfocenter/opengl/CMakeLists.txt #870787:870788
@@ -10,9 +10,15 @@
 
 kde4_add_plugin(kcm_opengl ${KCM_OPENGL_PART_SRCS} \
${KCM_OPENGL_PART_UIS_H})  
-target_link_libraries(kcm_opengl ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} \
                ${X11_X11_LIB}
-                      ${DL_LIBRARY}  ${OPENGL_gl_LIBRARY} \
${OPENGL_glu_LIBRARY}) +target_link_libraries(kcm_opengl ${KDE4_KDEUI_LIBS} \
${QT_QTGUI_LIBRARY} ${X11_X11_LIB})  
+find_library(DL_LIBRARY dl)
+if (DL_LIBRARY)
+  target_link_libraries(kcm_opengl ${DL_LIBRARY})
+endif(DL_LIBRARY)
+
+target_link_libraries(kcm_opengl ${OPENGL_gl_LIBRARY} \
${OPENGL_glu_LIBRARY}) +
 install(TARGETS kcm_opengl  DESTINATION ${PLUGIN_INSTALL_DIR})
 
 ########### install files ###############
--- trunk/KDE/kdebase/workspace/kcontrol/screensaver/CMakeLists.txt \
#870787:870788 @@ -26,8 +26,13 @@
 kde4_add_plugin(kcm_screensaver ${kcm_screensaver_PART_SRCS})
 
 
-target_link_libraries(kcm_screensaver  ${KDE4_KDE3SUPPORT_LIBS} \
${X11_LIBRARIES} ${DL_LIBRARY}) +target_link_libraries(kcm_screensaver  \
${KDE4_KDE3SUPPORT_LIBS} ${X11_LIBRARIES})  
+find_library(DL_LIBRARY dl)
+if (DL_LIBRARY)
+  target_link_libraries(kcm_screensaver ${DL_LIBRARY})
+endif(DL_LIBRARY)
+
 if(HAVE_GLXCHOOSEVISUAL)
    target_link_libraries(kcm_screensaver ${OPENGL_gl_LIBRARY})
 endif(HAVE_GLXCHOOSEVISUAL)
--- trunk/KDE/kdebase/workspace/krunner/lock/CMakeLists.txt #870787:870788
@@ -42,8 +42,15 @@
 
 kde4_add_executable(krunner_lock ${krunner_lock_SRCS} )
 
-target_link_libraries(krunner_lock  ${KDE4_KDEUI_LIBS} ${DL_LIBRARY} \
kworkspace) +target_link_libraries(krunner_lock  ${KDE4_KDEUI_LIBS})
 
+find_library(DL_LIBRARY dl)
+if (DL_LIBRARY)
+  target_link_libraries(krunner_lock ${DL_LIBRARY})
+endif(DL_LIBRARY)
+
+target_link_libraries(krunner_lock kworkspace)
+
 if (HAVE_XF86MISC)
   target_link_libraries(krunner_lock ${X11_Xxf86misc_LIB})
 endif (HAVE_XF86MISC)


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