[Plplot-cvs] SF.net SVN: plplot:[9423] trunk

[<ai...@us...>]

Revision: 9423
          http://plplot.svn.sourceforge.net/plplot/?rev=9423&view=rev
Author:   airwin
Date:     2009-02-01 01:23:32 +0000 (Sun, 01 Feb 2009)

Log Message:
-----------
Unless and until something better comes along, follow the Debian convention
for installation location of the Lua shared object wrapper for PLplot.

Modified Paths:
--------------
    trunk/bindings/lua/CMakeLists.txt
    trunk/cmake/modules/lua.cmake
    trunk/examples/lua/CMakeLists.txt

Modified: trunk/bindings/lua/CMakeLists.txt
===================================================================
--- trunk/bindings/lua/CMakeLists.txt	2009-02-01 01:22:04 UTC (rev 9422)
+++ trunk/bindings/lua/CMakeLists.txt	2009-02-01 01:23:32 UTC (rev 9423)
@@ -51,13 +51,13 @@
   plplotluac
   PROPERTIES
   INSTALL_RPATH "${LIB_INSTALL_RPATH}"
-  INSTALL_NAME_DIR "${LIB_DIR}"
+  INSTALL_NAME_DIR "${LUA_DIR}"
   )
 else(USE_RPATH)
   set_target_properties(
   plplotluac
   PROPERTIES
-  INSTALL_NAME_DIR "${LIB_DIR}"
+  INSTALL_NAME_DIR "${LUA_DIR}"
   )
 endif(USE_RPATH)
 
@@ -70,6 +70,6 @@
   )
 endif(APPLE)
 
-install(TARGETS plplotluac LIBRARY DESTINATION ${LIB_DIR})
+install(TARGETS plplotluac LIBRARY DESTINATION ${LUA_DIR})
 
 endif(ENABLE_lua)

Modified: trunk/cmake/modules/lua.cmake
===================================================================
--- trunk/cmake/modules/lua.cmake	2009-02-01 01:22:04 UTC (rev 9422)
+++ trunk/cmake/modules/lua.cmake	2009-02-01 01:23:32 UTC (rev 9423)
@@ -94,4 +94,12 @@
     set(ENABLE_lua OFF CACHE BOOL "Enable LUA bindings" FORCE)
   endif(NOT LUA_VERSION_VALID)
 
+if(ENABLE_lua)
+  # Unless some better convention comes along, follow what Debian does for
+  # install location of Lua wrapper shared object.
+  if(HAVE_lua51)
+    set(LUA_DIR ${LIB_DIR}/lua/5.1/plplot)
+  else(HAVE_lua51)
+    set(LUA_DIR ${LIB_DIR}/lua/50/plplot)
+  endif(HAVE_lua51)
 endif(ENABLE_lua)

Modified: trunk/examples/lua/CMakeLists.txt
===================================================================
--- trunk/examples/lua/CMakeLists.txt	2009-02-01 01:22:04 UTC (rev 9422)
+++ trunk/examples/lua/CMakeLists.txt	2009-02-01 01:23:32 UTC (rev 9423)
@@ -94,7 +94,7 @@
 @ONLY
 )
 
-set(lua_lib_location ${LIB_DIR})
+set(lua_lib_location ${LUA_DIR})
 configure_file(
 ${CMAKE_CURRENT_SOURCE_DIR}/plplot_examples.lua.in
 ${CMAKE_CURRENT_BINARY_DIR}/plplot_examples.lua_install


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.