colin/mirror-conky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More build fixes.

Browse Source
This commit is contained in:
Brenden Matthews
2018-12-22 16:16:28 -05:00
parent 50a4aa25ab
commit bc60fb2c2f
16 changed files with 180 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lua/CMakeLists.txt
View File

@@ -29,7 +29,7 @@ if(BUILD_X11)
include_directories(${luacairo_includes} ${CMAKE_CURRENT_SOURCE_DIR})
# Need the directory for -lSM
get_filename_component(X11_SM_LIB_PATH ${X11_SM_LIB} DIRECTORY)
get_filename_component(X11_SM_LIB_PATH ${X11_SM_LIB} DIRECTORY)
link_directories(${X11_SM_LIB_PATH})
# cairo_set_dash() needs this special hack to work properly
@@ -41,6 +41,8 @@ if(BUILD_X11)
target_link_libraries(conky-cairo ${luacairo_libs} toluapp_lib_static)
set(lua_libs ${lua_libs} conky-cairo)
print_target_properties(conky-cairo)
endif(BUILD_LUA_CAIRO)
if(BUILD_LUA_IMLIB2)
@@ -52,6 +54,8 @@ if(BUILD_X11)
target_link_libraries(conky-imlib2 ${luaimlib2_libs} toluapp_lib_static)
set(lua_libs ${lua_libs} conky-imlib2)
print_target_properties(conky-imlib2)
endif(BUILD_LUA_IMLIB2)
if(BUILD_LUA_RSVG)
@@ -63,6 +67,8 @@ if(BUILD_X11)
target_link_libraries(conky-rsvg ${luarsvg_libs} toluapp_lib_static)
set(lua_libs ${lua_libs} conky-rsvg)
print_target_properties(conky-rsvg)
endif(BUILD_LUA_RSVG)
if(BUILD_LUA_CAIRO AND BUILD_LUA_IMLIB2)