making the PATH and CPATH cached (so that they are accessible by other projects in a larger cmake build

5 files changed, 10 insertions, 16 deletions

diff --git a/lua-5.1-rc/CMakeLists.txt b/lua-5.1-rc/CMakeLists.txt
index 1b94599..4cb813c 100644
--- a/lua-5.1-rc/CMakeLists.txt
+++ b/lua-5.1-rc/CMakeLists.txt
@@ -20,15 +20,12 @@ IF(WIN32)
 ELSE()
   SET(INSTALL_BIN_SUBDIR "bin" CACHE STRING "installation executable subdirectory name")
   SET(INSTALL_LIB_SUBDIR "lib" CACHE STRING "installation library subdirectory name")
-  SET(INSTALL_LUA_PATH_SUBDIR "share/lua/5.1") # not editable
+  SET(INSTALL_LUA_PATH_SUBDIR "share/lua/5.1/" CACHE STRING "lua path subdirectory name")
   SET(INSTALL_LUA_LIB_SUBDIR "lib" CACHE STRING "installation lua lib subdirectory name")
-  SET(INSTALL_LUA_CPATH_SUBDIR "${INSTALL_LUA_LIB_SUBDIR}/lua/5.1") # not editable
+  SET(INSTALL_LUA_CPATH_SUBDIR "${INSTALL_LUA_LIB_SUBDIR}/lua/5.1/" CACHE STRING "lua cpath subdirectory name")
 ENDIF()
 
 IF(UNIX)
-#  IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr/local")
-#    ADD_DEFINITIONS(-DLUA_ROOT="${CMAKE_INSTALL_PREFIX}")
-#  ENDIF()
   SET(LUA_ROOT "${CMAKE_INSTALL_PREFIX}")
 ENDIF()
 
diff --git a/lua-5.1/CMakeLists.txt b/lua-5.1/CMakeLists.txt
index c33fb38..96a10b5 100644
--- a/lua-5.1/CMakeLists.txt
+++ b/lua-5.1/CMakeLists.txt
@@ -18,15 +18,12 @@ IF(WIN32)
 ELSE()
   SET(INSTALL_BIN_SUBDIR "bin" CACHE STRING "installation executable subdirectory name")
   SET(INSTALL_LIB_SUBDIR "lib" CACHE STRING "installation library subdirectory name")
-  SET(INSTALL_LUA_PATH_SUBDIR "share/lua/5.1") # not editable
+  SET(INSTALL_LUA_PATH_SUBDIR "share/lua/5.1/" CACHE STRING "lua path subdirectory name")
   SET(INSTALL_LUA_LIB_SUBDIR "lib" CACHE STRING "installation lua lib subdirectory name")
-  SET(INSTALL_LUA_CPATH_SUBDIR "${INSTALL_LUA_LIB_SUBDIR}/lua/5.1") # not editable
+  SET(INSTALL_LUA_CPATH_SUBDIR "${INSTALL_LUA_LIB_SUBDIR}/lua/5.1/" CACHE STRING "lua cpath subdirectory name")
 ENDIF()
 
 IF(UNIX)
-#  IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr/local")
-#    ADD_DEFINITIONS(-DLUA_ROOT="${CMAKE_INSTALL_PREFIX}")
-#  ENDIF()
   SET(LUA_ROOT "${CMAKE_INSTALL_PREFIX}")
 ENDIF()
 
diff --git a/lua-5.2/CMakeLists.txt b/lua-5.2/CMakeLists.txt
index 6a461da..7cb8108 100644
--- a/lua-5.2/CMakeLists.txt
+++ b/lua-5.2/CMakeLists.txt
@@ -18,9 +18,9 @@ IF(WIN32)
 ELSE()
   SET(INSTALL_BIN_SUBDIR "bin" CACHE STRING "installation executable subdirectory name")
   SET(INSTALL_LIB_SUBDIR "lib" CACHE STRING "installation library subdirectory name")
-  SET(INSTALL_LUA_PATH_SUBDIR "share/lua/5.2/") # not editable
+  SET(INSTALL_LUA_PATH_SUBDIR "share/lua/5.2/" CACHE STRING "lua path subdirectory name")
   SET(INSTALL_LUA_LIB_SUBDIR "lib" CACHE STRING "installation lua lib subdirectory name")
-  SET(INSTALL_LUA_CPATH_SUBDIR "${INSTALL_LUA_LIB_SUBDIR}/lua/5.2/") # not editable
+  SET(INSTALL_LUA_CPATH_SUBDIR "${INSTALL_LUA_LIB_SUBDIR}/lua/5.2/" CACHE STRING "lua cpath subdirectory name")
 ENDIF()
 
 IF(UNIX)
diff --git a/luajit-2.0/CMakeLists.txt b/luajit-2.0/CMakeLists.txt
index 9102d4c..702f56d 100644
--- a/luajit-2.0/CMakeLists.txt
+++ b/luajit-2.0/CMakeLists.txt
@@ -29,9 +29,9 @@ IF(WIN32)
 ELSE()
   SET(INSTALL_BIN_SUBDIR "bin" CACHE STRING "installation executable subdirectory name")
   SET(INSTALL_LIB_SUBDIR "lib" CACHE STRING "installation library subdirectory name")
-  SET(INSTALL_LUA_PATH_SUBDIR "share/lua/5.1") # not editable
+  SET(INSTALL_LUA_PATH_SUBDIR "share/lua/5.1/" CACHE STRING "lua path subdirectory name")
   SET(INSTALL_LUA_LIB_SUBDIR "lib" CACHE STRING "installation lua lib subdirectory name")
-  SET(INSTALL_LUA_CPATH_SUBDIR "${INSTALL_LUA_LIB_SUBDIR}/lua/5.1") # not editable
+  SET(INSTALL_LUA_CPATH_SUBDIR "${INSTALL_LUA_LIB_SUBDIR}/lua/5.1/" CACHE STRING "lua cpath subdirectory name")
 ENDIF()
 
 ADD_DEFINITIONS(-DLUA_MULTILIB="${INSTALL_LUA_LIB_SUBDIR}")
diff --git a/luajit-2.1/CMakeLists.txt b/luajit-2.1/CMakeLists.txt
index 35ada57..efd5f4f 100644
--- a/luajit-2.1/CMakeLists.txt
+++ b/luajit-2.1/CMakeLists.txt
@@ -29,9 +29,9 @@ IF(WIN32)
 ELSE()
   SET(INSTALL_BIN_SUBDIR "bin" CACHE STRING "installation executable subdirectory name")
   SET(INSTALL_LIB_SUBDIR "lib" CACHE STRING "installation library subdirectory name")
-  SET(INSTALL_LUA_PATH_SUBDIR "share/lua/5.1") # not editable
+  SET(INSTALL_LUA_PATH_SUBDIR "share/lua/5.1/" CACHE STRING "lua path subdirectory name")
   SET(INSTALL_LUA_LIB_SUBDIR "lib" CACHE STRING "installation lua lib subdirectory name")
-  SET(INSTALL_LUA_CPATH_SUBDIR "${INSTALL_LUA_LIB_SUBDIR}/lua/5.1") # not editable
+  SET(INSTALL_LUA_CPATH_SUBDIR "${INSTALL_LUA_LIB_SUBDIR}/lua/5.1/" CACHE STRING "lua cpath subdirectory name")
 ENDIF()
 
 ADD_DEFINITIONS(-DLUA_MULTILIB="${INSTALL_LUA_LIB_SUBDIR}")