80 lines
2.8 KiB
Plaintext
80 lines
2.8 KiB
Plaintext
$OpenBSD: patch-awesomeConfig_cmake,v 1.8 2012/07/17 11:32:00 dcoppa Exp $
|
|
--- awesomeConfig.cmake.orig Sun Jul 15 12:12:21 2012
|
|
+++ awesomeConfig.cmake Tue Jul 17 13:16:29 2012
|
|
@@ -16,11 +16,11 @@ option(COMPRESS_MANPAGES "compress manpages" ON)
|
|
option(GENERATE_LUADOC "generate luadoc" ON)
|
|
|
|
# {{{ CFLAGS
|
|
-add_definitions(-std=gnu99 -ggdb3 -fno-strict-aliasing -Wall -Wextra
|
|
- -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings
|
|
- -Wsign-compare -Wunused -Wno-unused-parameter -Wuninitialized -Winit-self
|
|
- -Wpointer-arith -Wredundant-decls -Wformat-nonliteral
|
|
- -Wno-format-zero-length -Wmissing-format-attribute -Wmissing-prototypes
|
|
+add_definitions(-std=gnu99 -fgnu89-inline -fno-strict-aliasing
|
|
+ -Wchar-subscripts -Wcast-align -Wwrite-strings
|
|
+ -Wsign-compare -Wunused -Wno-unused-parameter -Wuninitialized
|
|
+ -Wpointer-arith -Wformat-nonliteral -Wno-format-zero-length
|
|
+ -Wmissing-format-attribute -Wmissing-prototypes
|
|
-Wstrict-prototypes)
|
|
# }}}
|
|
|
|
@@ -54,7 +54,6 @@ a_find_program(ASCIIDOC_EXECUTABLE asciidoc FALSE)
|
|
a_find_program(XMLTO_EXECUTABLE xmlto FALSE)
|
|
a_find_program(GZIP_EXECUTABLE gzip FALSE)
|
|
# lua documentation
|
|
-a_find_program(LUA_EXECUTABLE lua FALSE)
|
|
a_find_program(LUADOC_EXECUTABLE luadoc FALSE)
|
|
# theme graphics
|
|
a_find_program(CONVERT_EXECUTABLE convert TRUE)
|
|
@@ -62,8 +61,8 @@ a_find_program(CONVERT_EXECUTABLE convert TRUE)
|
|
include(FindDoxygen)
|
|
# pkg-config
|
|
include(FindPkgConfig)
|
|
-# lua 5.1
|
|
-include(FindLua51) #Due to a cmake bug, you will see Lua50 on screen
|
|
+# lua libraries
|
|
+include(FindLuaLibs)
|
|
# }}}
|
|
|
|
# {{{ Check if documentation can be build
|
|
@@ -139,9 +138,10 @@ pkg_check_modules(AWESOME_REQUIRED REQUIRED
|
|
xcb-xtest
|
|
xcb-xinerama
|
|
xcb-shape
|
|
- xcb-util>=0.3.8
|
|
+ xcb-aux>=0.3.6
|
|
+ xcb-atom>=0.3.6
|
|
xcb-keysyms>=0.3.4
|
|
- xcb-icccm>=0.3.8
|
|
+ xcb-icccm>=0.3.6
|
|
xcb-image>=0.3.0
|
|
cairo-xcb
|
|
libstartup-notification-1.0>=0.10
|
|
@@ -192,7 +192,7 @@ else()
|
|
endif()
|
|
|
|
# Error check
|
|
-if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug
|
|
+if(NOT LUALIBS_FOUND)
|
|
message(FATAL_ERROR "lua library not found")
|
|
endif()
|
|
|
|
@@ -232,7 +232,7 @@ endif()
|
|
if(DEFINED SYSCONFDIR)
|
|
set(SYSCONFDIR ${SYSCONFDIR} CACHE PATH "config directory")
|
|
else()
|
|
- set(SYSCONFDIR ${CMAKE_INSTALL_PREFIX}/etc CACHE PATH "config directory")
|
|
+ set(SYSCONFDIR /etc CACHE PATH "config directory")
|
|
endif()
|
|
|
|
#If an XDG Config Dir is specificed, use it instead
|
|
@@ -261,7 +261,7 @@ endif()
|
|
if(DEFINED AWESOME_MAN_PATH)
|
|
set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory")
|
|
else()
|
|
- set(AWESOME_MAN_PATH ${CMAKE_INSTALL_PREFIX}/share/man CACHE PATH "awesome manpage directory")
|
|
+ set(AWESOME_MAN_PATH ${CMAKE_INSTALL_PREFIX}/man CACHE PATH "awesome manpage directory")
|
|
endif()
|
|
|
|
# Hide to avoid confusion
|