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

List:       kde-commits
Subject:    extragear/utils/guidance-power-manager/modules
From:       Funda Wang <fundawang () linux ! net ! cn>
Date:       2010-02-13 7:02:50
Message-ID: 1266044570.834970.28902.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1089393 by fwang:

use pkgconfig to find x11 libs


 M  +6 -2      CMakeLists.txt  


--- trunk/extragear/utils/guidance-power-manager/modules/CMakeLists.txt \
#1089392:1089393 @@ -1,10 +1,14 @@
 GET_FILENAME_COMPONENT(PYTHON_LIB_INSTALL "${PYTHON_LIBRARY}" PATH)
 GET_FILENAME_COMPONENT(SITEPACKAGE "${PYTHON_LIB_INSTALL}/../site-packages" \
ABSOLUTE)  
+find_package(PkgConfig)
+pkg_check_modules(ixf86 REQUIRED x11 xxf86vm xrandr xscrnsaver)
+
 ADD_LIBRARY(ixf86misc SHARED ixf86misc.c)
 SET_TARGET_PROPERTIES(ixf86misc PROPERTIES PREFIX "")
-include_directories(${PYTHON_INCLUDE_PATH})
-TARGET_LINK_LIBRARIES(ixf86misc -L/usr/X11R6/lib -lX11 -lXxf86vm -lXext -lXrandr \
-lXrender -lXss ${PYTHON_LIBRARY}) +include_directories(${PYTHON_INCLUDE_PATH} \
${ixf86_INCLUDE_DIRS}) +link_directories(${ixf86_LIBRARY_DIRS})
+TARGET_LINK_LIBRARIES(ixf86misc ${ixf86_LIBRARIES} ${PYTHON_LIBRARY})
 
 INSTALL(TARGETS ixf86misc DESTINATION "${PYTHON_SITE_PACKAGES_DIR}")
 INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/xf86misc.py" DESTINATION \
"${PYTHON_SITE_PACKAGES_DIR}")


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