Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[9624] trunk/cmake/modules
|
From: <sm...@us...> - 2009-02-26 20:13:45
|
Revision: 9624
http://plplot.svn.sourceforge.net/plplot/?rev=9624&view=rev
Author: smekal
Date: 2009-02-26 20:13:40 +0000 (Thu, 26 Feb 2009)
Log Message:
-----------
Replaced all occurences of "lua" with "Lua" since this is the correct name (lua.cmake).
The Lua bindings are only build if the SWIG version is 1.3.36 or above and if double precision floating points are used. It might work with an older SWIG version, but I only tried it with 1.3.31 which was not "good" enough (lua.cmake).
Added a space to a message (ocaml.cmake)
Modified Paths:
--------------
trunk/cmake/modules/lua.cmake
trunk/cmake/modules/ocaml.cmake
trunk/cmake/modules/plplot.cmake
Modified: trunk/cmake/modules/lua.cmake
===================================================================
--- trunk/cmake/modules/lua.cmake 2009-02-26 19:57:40 UTC (rev 9623)
+++ trunk/cmake/modules/lua.cmake 2009-02-26 20:13:40 UTC (rev 9624)
@@ -1,6 +1,6 @@
# cmake/modules/lua.cmake
#
-# LUA binding configuration
+# Lua binding configuration
#
# Copyright (C) 2008 Werner Smekal
#
@@ -19,30 +19,45 @@
# along with the file PLplot; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-# Module for determining LUA bindings configuration options
+# Module for determining Lua bindings configuration options
-# Options to enable LUA bindings
+# Options to enable Lua bindings
if(DEFAULT_NO_BINDINGS)
- option(ENABLE_lua "Enable LUA bindings" OFF)
+ option(ENABLE_lua "Enable Lua bindings" OFF)
else(DEFAULT_NO_BINDINGS)
- option(ENABLE_lua "Enable LUA bindings" ON)
+ option(ENABLE_lua "Enable Lua bindings" ON)
endif(DEFAULT_NO_BINDINGS)
if(ENABLE_lua AND NOT BUILD_SHARED_LIBS)
message(STATUS "WARNING: "
- "Lua requires shared libraries. Disabling lua bindings")
- set(ENABLE_lua OFF CACHE BOOL "Enable LUA bindings" FORCE)
+ "Lua requires shared libraries. Disabling Lua bindings")
+ set(ENABLE_lua OFF CACHE BOOL "Enable Lua bindings" FORCE)
endif(ENABLE_lua AND NOT BUILD_SHARED_LIBS)
if(ENABLE_lua AND NOT SWIG_FOUND)
message(STATUS "WARNING: "
- "swig not found. Disabling LUA bindings")
- set(ENABLE_lua OFF CACHE BOOL "Enable LUA bindings" FORCE)
+ "swig not found. Disabling Lua bindings")
+ set(ENABLE_lua OFF CACHE BOOL "Enable Lua bindings" FORCE)
endif(ENABLE_lua AND NOT SWIG_FOUND)
if(ENABLE_lua)
+ transform_version(NUMERICAL_SWIG_MINIMUM_VERSION_FOR_LUA "1.3.36")
+ transform_version(NUMERICAL_SWIG_VERSION "${SWIG_VERSION}")
+ if(NUMERICAL_SWIG_VERSION LESS "${NUMERICAL_SWIG_MINIMUM_VERSION_FOR_LUA}")
+ message(STATUS "WARNING: swig version too old for Lua bindings. Disabling Lua bindings.")
+ set(ENABLE_lua OFF CACHE BOOL "Enable Lua bindings" FORCE)
+ endif(NUMERICAL_SWIG_VERSION LESS "${NUMERICAL_SWIG_MINIMUM_VERSION_FOR_LUA}")
+endif(ENABLE_lua)
+
+if(ENABLE_lua AND NOT PL_DOUBLE)
+ message(STATUS "WARNING: "
+ "only single precision floating point. Disabling Lua bindings")
+ set(ENABLE_lua OFF CACHE BOOL "Enable Lua bindings" FORCE)
+endif(ENABLE_lua AND NOT PL_DOUBLE)
+
+if(ENABLE_lua)
# Check for Lua libraries which defines
- # LUA_LIBRARIES = path to the lua library
+ # LUA_LIBRARIES = path to the Lua library
# LUA_INCLUDE_DIR = path to where lua.h is found
option(HAVE_lua51 "Lua version is 5.1" OFF)
if(HAVE_lua51)
@@ -59,8 +74,8 @@
endif(HAVE_lua51)
if(NOT LUA_FOUND)
message(STATUS "WARNING: "
- "lua library and/or header not found. Disabling lua bindings")
- set(ENABLE_lua OFF CACHE BOOL "Enable LUA bindings" FORCE)
+ "Lua library and/or header not found. Disabling Lua bindings")
+ set(ENABLE_lua OFF CACHE BOOL "Enable Lua bindings" FORCE)
endif(NOT LUA_FOUND)
endif(ENABLE_lua)
@@ -68,13 +83,13 @@
find_program(LUA_EXECUTABLE lua)
if(NOT LUA_EXECUTABLE)
message(STATUS "WARNING: "
- "lua executable not found. Disabling lua bindings")
- set(ENABLE_lua OFF CACHE BOOL "Enable LUA bindings" FORCE)
+ "Lua executable not found. Disabling Lua bindings")
+ set(ENABLE_lua OFF CACHE BOOL "Enable Lua bindings" FORCE)
endif(NOT LUA_EXECUTABLE)
endif(ENABLE_lua)
if(ENABLE_lua)
- # Check whether you have found a lua executable that is consistent
+ # Check whether you have found a Lua executable that is consistent
# with the library version.
execute_process(COMMAND ${LUA_EXECUTABLE} -v
OUTPUT_VARIABLE LUA_VERSION
@@ -97,8 +112,8 @@
if(NOT LUA_VERSION_VALID)
message(STATUS "WARNING: "
- "lua executable found but version not consistent with library. Disabling lua bindings")
- set(ENABLE_lua OFF CACHE BOOL "Enable LUA bindings" FORCE)
+ "Lua executable found but version not consistent with library. Disabling Lua bindings")
+ set(ENABLE_lua OFF CACHE BOOL "Enable Lua bindings" FORCE)
endif(NOT LUA_VERSION_VALID)
endif(ENABLE_lua)
Modified: trunk/cmake/modules/ocaml.cmake
===================================================================
--- trunk/cmake/modules/ocaml.cmake 2009-02-26 19:57:40 UTC (rev 9623)
+++ trunk/cmake/modules/ocaml.cmake 2009-02-26 20:13:40 UTC (rev 9624)
@@ -36,7 +36,7 @@
if (OCAMLBUILD)
message(STATUS "OCAMLBUILD = ${OCAMLBUILD}")
else (OCAMLBUILD)
- message(STATUS "WARNING:"
+ message(STATUS "WARNING: "
"ocamlbuild not found. Disabling ocaml bindings")
set(ENABLE_ocaml OFF CACHE BOOL "Enable OCaml bindings" FORCE)
endif (OCAMLBUILD)
Modified: trunk/cmake/modules/plplot.cmake
===================================================================
--- trunk/cmake/modules/plplot.cmake 2009-02-26 19:57:40 UTC (rev 9623)
+++ trunk/cmake/modules/plplot.cmake 2009-02-26 20:13:40 UTC (rev 9624)
@@ -253,7 +253,7 @@
# Language bindings
# =======================================================================
-# Find swig. Required for python and java bindings.
+# Find swig. Required for python, java and Lua bindings.
# N.B. all version tests done below need experimental FindSWIG.cmake which
# is currently carried in this directory by PLplot, but which eventually
# should get into CMake.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
