diff --git a/cmake-2.8.11-rc4-lua-5.2.patch b/cmake-2.8.11-rc4-lua-5.2.patch new file mode 100644 index 0000000..d900450 --- /dev/null +++ b/cmake-2.8.11-rc4-lua-5.2.patch @@ -0,0 +1,77 @@ +diff -up cmake-2.8.11-rc4/Modules/FindLua52.cmake.lua-52 cmake-2.8.11-rc4/Modules/FindLua52.cmake +--- cmake-2.8.11-rc4/Modules/FindLua52.cmake.lua-52 2013-05-13 09:41:15.221278404 -0400 ++++ cmake-2.8.11-rc4/Modules/FindLua52.cmake 2013-05-13 09:03:43.422233385 -0400 +@@ -0,0 +1,73 @@ ++# Locate Lua library ++# This module defines ++# LUA52_FOUND, if false, do not try to link to Lua ++# LUA_LIBRARIES ++# LUA_INCLUDE_DIR, where to find lua.h ++# LUA_VERSION_STRING, the version of Lua found (since CMake 2.8.8) ++# ++# Note that the expected include convention is ++# #include "lua.h" ++# and not ++# #include ++# This is because, the lua location is not standardized and may exist ++# in locations other than lua/ ++ ++#============================================================================= ++# Copyright 2007-2009 Kitware, Inc. ++# ++# Distributed under the OSI-approved BSD License (the "License"); ++# see accompanying file Copyright.txt for details. ++# ++# This software is distributed WITHOUT ANY WARRANTY; without even the ++# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++# See the License for more information. ++#============================================================================= ++# (To distribute this file outside of CMake, substitute the full ++# License text for the above reference.) ++ ++find_path(LUA_INCLUDE_DIR lua.h ++ HINTS ++ ENV LUA_DIR ++ PATH_SUFFIXES include/lua52 include/lua5.2 include/lua-5.2 include/lua include ++ PATHS ++ ~/Library/Frameworks ++ /Library/Frameworks ++ /sw # Fink ++ /opt/local # DarwinPorts ++ /opt/csw # Blastwave ++ /opt ++) ++ ++find_library(LUA_LIBRARY ++ NAMES lua52 lua5.2 lua-5.2 lua ++ HINTS ++ ENV LUA_DIR ++ PATH_SUFFIXES lib ++ PATHS ++ ~/Library/Frameworks ++ /Library/Frameworks ++ /sw ++ /opt/local ++ /opt/csw ++ /opt ++) ++ ++if(LUA_LIBRARY) ++ # include the math library for Unix ++ if(UNIX AND NOT APPLE AND NOT BEOS) ++ find_library(LUA_MATH_LIBRARY m) ++ set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") ++ # For Windows and Mac, don't need to explicitly include the math library ++ else() ++ set( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries") ++ endif() ++endif() ++ ++include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) ++# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if ++# all listed variables are TRUE ++FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua52 ++ REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR) ++ ++mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY) ++ diff --git a/cmake.spec b/cmake.spec index 439163d..d1b6cd9 100644 --- a/cmake.spec +++ b/cmake.spec @@ -13,7 +13,7 @@ Name: cmake Version: 2.8.11 -Release: 0.8.rc4%{?dist} +Release: 0.9.rc4%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -41,6 +41,8 @@ Patch3: cmake-FindPostgreSQL.patch # Patch FindImageMagick.cmake for newer ImageMagick versions # http://public.kitware.com/Bug/view.php?id=14012 Patch4: cmake-2.8.11-rc1-IM_pkgconfig_hints.patch +# Add FindLua52.cmake +Patch5: cmake-2.8.11-rc4-lua-5.2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran @@ -94,6 +96,7 @@ The %{name}-gui package contains the Qt based GUI for CMake. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build @@ -190,6 +193,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Mon May 13 2013 Tom Callaway - 2.8.11-0.9.rc4 +- add FindLua52.cmake + * Thu May 9 2013 Orion Poplawski - 2.8.11-0.8.rc4 - Update to 2.8.11-rc4