[Orxonox-commit 3260] r7951 - code/branches/kicklib/cmake/tools
rgrieder at orxonox.net
rgrieder at orxonox.net
Thu Feb 24 03:51:07 CET 2011
Author: rgrieder
Date: 2011-02-24 03:51:06 +0100 (Thu, 24 Feb 2011)
New Revision: 7951
Modified:
code/branches/kicklib/cmake/tools/FindLua5.1.cmake
Log:
Bugfix for FindLua5.1.cmake
Modified: code/branches/kicklib/cmake/tools/FindLua5.1.cmake
===================================================================
--- code/branches/kicklib/cmake/tools/FindLua5.1.cmake 2011-02-22 03:12:00 UTC (rev 7950)
+++ code/branches/kicklib/cmake/tools/FindLua5.1.cmake 2011-02-24 02:51:06 UTC (rev 7951)
@@ -55,7 +55,7 @@
# Find include path
FIND_PATH(LUA5.1_INCLUDE_DIR lua.h
- PATHS $ENV{LUA_DIR}
+ PATHS $ENV{LUA5.1_DIR}
PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include
)
@@ -65,6 +65,7 @@
COMPARE_VERSION_STRINGS("${LUA5.1_VERSION}" "5.1" _version_compare TRUE)
IF(NOT _version_compare EQUAL 0)
# Wrong version
+ MESSAGE(SEND_ERROR "Version of Lua header found is not 5.1")
SET(LUA5.1_INCLUDE_DIR "LUA5.1_INCLUDE_DIR-NOTFOUND" CACHE PATH "" FORCE)
ENDIF(NOT _version_compare EQUAL 0)
ENDIF(LUA5.1_INCLUDE_DIR)
@@ -84,8 +85,8 @@
)
# Handle the REQUIRED argument and set LUA5.1_FOUND
-FIND_PACKAGE_HANDLE_ADVANCED_ARGS(Lua5.1 DEFAULT_MSG
- LUA5.1_LIBRARY
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua5.1 DEFAULT_MSG
+ LUA5.1_LIBRARY_OPTIMIZED
LUA5.1_INCLUDE_DIR
)
More information about the Orxonox-commit
mailing list