PolytreeDE/polybar
1
0
Fork 0
mirror of https://github.com/polybar/polybar.git synced 2025-08-07 22:03:24 -04:00
Code Releases Activity

refactor: Replace X11 handling with xpp+xcb

Browse source 
xrandr 1.5 is no longer required for the monitor
handling to work

fixes jaagr/lemonbuddy#12
fixes jaagr/lemonbuddy#24
This commit is contained in:
Michael Carlberg 2016-06-23 22:26:19 +02:00
parent 00e96223a5
commit 8b7f2b7268
12 changed files with 443 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

24
CMakeLists.txt
View file

@ -73,16 +73,11 @@ endif()
#
find_package("Boost" REQUIRED)
find_package("Threads" REQUIRED)
find_package("X11" REQUIRED "X11_Xrandr")
set(PROJECT_INCL_DIRS "${PROJECT_SOURCE_DIR}/include"
${Boost_INCLUDE_DIRS}
${X11_INCLUDE_DIR})
${BOOST_INCLUDE_DIR})
set(PROJECT_LINK_LIBS
${Boost_LIBRARIES}
${X11_LIBRARIES}
${X11_Xrandr_LIB}
${BOOST_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT})
if(ENABLE_I3)
@ -126,6 +121,14 @@ if(ENABLE_NETWORK)
endif()
endif()
#
# Load the xpp library
#
set(XCB_PROTOS xproto randr)
add_subdirectory("${PROJECT_SOURCE_DIR}/contrib/xpp")
set(PROJECT_INCL_DIRS ${PROJECT_INCL_DIRS} ${XPP_INCLUDE_DIRS})
set(PROJECT_LINK_LIBS ${PROJECT_LINK_LIBS} ${XPP_LIBRARIES})
#
# Install executable and wrapper
#
@ -141,8 +144,11 @@ message(STATUS " Enable mpd support ${ENABLE_MPD}")
message(STATUS " Enable network support ${ENABLE_NETWORK}")
message(STATUS "---------------------------")
add_subdirectory("${PROJECT_SOURCE_DIR}/src")
add_executable(${PROJECT_NAME} ${SOURCE_FILES}
add_subdirectory("${PROJECT_SOURCE_DIR}/src" EXCLUDE_FROM_ALL)
link_directories(${PROJECT_LINK_DIRS})
include_directories(${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR} ${PROJECT_INCL_DIRS})
link_libraries(${PROJECT_LINK_LIBS})
add_executable(${PROJECT_NAME} ${FILES}
"examples/config"
"examples/config.bspwm"
"examples/config.i3")