|
 |
737e409 |
diff -up awesome-3.5.6/awesomeConfig.cmake.lua-53 awesome-3.5.6/awesomeConfig.cmake
|
|
|
737e409 |
--- awesome-3.5.6/awesomeConfig.cmake.lua-53 2015-01-16 11:50:17.285481422 -0500
|
|
|
737e409 |
+++ awesome-3.5.6/awesomeConfig.cmake 2015-01-16 11:50:17.288481386 -0500
|
|
|
737e409 |
@@ -64,8 +64,8 @@ a_find_program(CONVERT_EXECUTABLE conver
|
|
|
737e409 |
include(FindDoxygen)
|
|
|
737e409 |
# pkg-config
|
|
|
737e409 |
include(FindPkgConfig)
|
|
|
737e409 |
-# lua 5.2
|
|
|
737e409 |
-include(FindLua52)
|
|
|
737e409 |
+# lua 5.3
|
|
|
737e409 |
+include(${SOURCE_DIR}/FindLua53.cmake)
|
|
|
737e409 |
# }}}
|
|
|
737e409 |
|
|
|
737e409 |
# {{{ Check if documentation can be build
|
|
|
737e409 |
@@ -189,7 +189,7 @@ else()
|
|
|
737e409 |
endif()
|
|
|
737e409 |
|
|
|
737e409 |
# Error check
|
|
|
737e409 |
-if(NOT LUA52_FOUND AND NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug
|
|
|
737e409 |
+if(NOT LUA53_FOUND AND NOT LUA52_FOUND AND NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug
|
|
|
737e409 |
message(FATAL_ERROR "lua library not found")
|
|
|
737e409 |
endif()
|
|
|
737e409 |
|
|
|
737e409 |
diff -up awesome-3.5.6/FindLua53.cmake.lua-53 awesome-3.5.6/FindLua53.cmake
|
|
|
737e409 |
--- awesome-3.5.6/FindLua53.cmake.lua-53 2015-01-16 11:50:17.288481386 -0500
|
|
|
737e409 |
+++ awesome-3.5.6/FindLua53.cmake 2015-01-16 11:51:33.821555666 -0500
|
|
|
737e409 |
@@ -0,0 +1,92 @@
|
|
|
737e409 |
+# Locate Lua library
|
|
|
737e409 |
+# This module defines
|
|
|
737e409 |
+# LUA53_FOUND, if false, do not try to link to Lua
|
|
|
737e409 |
+# LUA_LIBRARIES
|
|
|
737e409 |
+# LUA_INCLUDE_DIR, where to find lua.h
|
|
|
737e409 |
+# LUA_VERSION_STRING, the version of Lua found (since CMake 2.8.8)
|
|
|
737e409 |
+#
|
|
|
737e409 |
+# Note that the expected include convention is
|
|
|
737e409 |
+# #include "lua.h"
|
|
|
737e409 |
+# and not
|
|
|
737e409 |
+# #include <lua/lua.h>
|
|
|
737e409 |
+# This is because, the lua location is not standardized and may exist
|
|
|
737e409 |
+# in locations other than lua/
|
|
|
737e409 |
+
|
|
|
737e409 |
+#=============================================================================
|
|
|
737e409 |
+# Copyright 2007-2009 Kitware, Inc.
|
|
|
737e409 |
+# All rights reserved.
|
|
|
737e409 |
+#
|
|
|
737e409 |
+# Redistribution and use in source and binary forms, with or without
|
|
|
737e409 |
+# modification, are permitted provided that the following conditions
|
|
|
737e409 |
+# are met:
|
|
|
737e409 |
+#
|
|
|
737e409 |
+# * Redistributions of source code must retain the above copyright
|
|
|
737e409 |
+# notice, this list of conditions and the following disclaimer.
|
|
|
737e409 |
+#
|
|
|
737e409 |
+# * Redistributions in binary form must reproduce the above copyright
|
|
|
737e409 |
+# notice, this list of conditions and the following disclaimer in the
|
|
|
737e409 |
+# documentation and/or other materials provided with the distribution.
|
|
|
737e409 |
+#
|
|
|
737e409 |
+# * Neither the names of Kitware, Inc., the Insight Software Consortium,
|
|
|
737e409 |
+# nor the names of their contributors may be used to endorse or promote
|
|
|
737e409 |
+# products derived from this software without specific prior written
|
|
|
737e409 |
+# permission.
|
|
|
737e409 |
+#
|
|
|
737e409 |
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
|
737e409 |
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
|
737e409 |
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
|
737e409 |
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
|
737e409 |
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
|
737e409 |
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
|
737e409 |
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
737e409 |
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
737e409 |
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
737e409 |
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
|
737e409 |
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
737e409 |
+
|
|
|
737e409 |
+find_path(LUA_INCLUDE_DIR lua.h
|
|
|
737e409 |
+ HINTS
|
|
|
737e409 |
+ ENV LUA_DIR
|
|
|
737e409 |
+ PATH_SUFFIXES include/lua53 include/lua5.3 include/lua-5.3 include/lua include
|
|
|
737e409 |
+ PATHS
|
|
|
737e409 |
+ ~/Library/Frameworks
|
|
|
737e409 |
+ /Library/Frameworks
|
|
|
737e409 |
+ /sw # Fink
|
|
|
737e409 |
+ /opt/local # DarwinPorts
|
|
|
737e409 |
+ /opt/csw # Blastwave
|
|
|
737e409 |
+ /opt
|
|
|
737e409 |
+)
|
|
|
737e409 |
+
|
|
|
737e409 |
+find_library(LUA_LIBRARY
|
|
|
737e409 |
+ NAMES lua53 lua5.3 lua-5.3 lua
|
|
|
737e409 |
+ HINTS
|
|
|
737e409 |
+ ENV LUA_DIR
|
|
|
737e409 |
+ PATH_SUFFIXES lib
|
|
|
737e409 |
+ PATHS
|
|
|
737e409 |
+ ~/Library/Frameworks
|
|
|
737e409 |
+ /Library/Frameworks
|
|
|
737e409 |
+ /sw
|
|
|
737e409 |
+ /opt/local
|
|
|
737e409 |
+ /opt/csw
|
|
|
737e409 |
+ /opt
|
|
|
737e409 |
+)
|
|
|
737e409 |
+
|
|
|
737e409 |
+if(LUA_LIBRARY)
|
|
|
737e409 |
+ # include the math library for Unix
|
|
|
737e409 |
+ if(UNIX AND NOT APPLE AND NOT BEOS)
|
|
|
737e409 |
+ find_library(LUA_MATH_LIBRARY m)
|
|
|
737e409 |
+ set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
|
|
|
737e409 |
+ # For Windows and Mac, don't need to explicitly include the math library
|
|
|
737e409 |
+ else()
|
|
|
737e409 |
+ set( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
|
|
|
737e409 |
+ endif()
|
|
|
737e409 |
+endif()
|
|
|
737e409 |
+
|
|
|
737e409 |
+include(FindPackageHandleStandardArgs)
|
|
|
737e409 |
+# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
|
|
|
737e409 |
+# all listed variables are TRUE
|
|
|
737e409 |
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua53
|
|
|
737e409 |
+ REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR)
|
|
|
737e409 |
+
|
|
|
737e409 |
+mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY)
|
|
|
737e409 |
+
|