awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use version agnostic FindLua from cmake-3.0.0

This commit is contained in:
Heiko Becker 2014-09-07 19:33:18 +02:00 committed by Daniel Hahler
parent 4bea4554fb
commit b0d4f4eb0e
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.0) cmake_minimum_required(VERSION 3.0.0)
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
if(COMMAND cmake_policy) if(COMMAND cmake_policy)

9
awesomeConfig.cmake
View File

@ -60,8 +60,8 @@ a_find_program(CONVERT_EXECUTABLE convert TRUE)
include(FindDoxygen) include(FindDoxygen)
# pkg-config # pkg-config
include(FindPkgConfig) include(FindPkgConfig)
# lua 5.1 # lua
include(FindLua51) include(FindLua)
# }}} # }}}
# {{{ Check if documentation can be build # {{{ Check if documentation can be build
@ -189,11 +189,6 @@ else()
message(STATUS "checking for __builtin_clz -- no") message(STATUS "checking for __builtin_clz -- no")
endif() endif()
# Error check
if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug
message(FATAL_ERROR "lua library not found")
endif()
set(AWESOME_REQUIRED_LDFLAGS set(AWESOME_REQUIRED_LDFLAGS
${AWESOME_COMMON_REQUIRED_LDFLAGS} ${AWESOME_COMMON_REQUIRED_LDFLAGS}
${AWESOME_REQUIRED_LDFLAGS} ${AWESOME_REQUIRED_LDFLAGS}