From 4ab1963e987be57812281868385600db1f29c318 Mon Sep 17 00:00:00 2001
From: bigbes <bigbes@gmail.com>
Date: Tue, 6 May 2014 19:39:33 +0400
Subject: [PATCH] Fix paths for ${MODULE_FULL_${type}}
If ${MODULE_${type}} is absolute - do not prepend with ${CMAKE_INSTALL_PREFIX}
---
CMakeLists.txt | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca816736e8..c56773e3a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,13 +149,21 @@ set(MODULE_LIBDIR "${CMAKE_INSTALL_LIBDIR}/${MODULE_SUFFIX}")
set(MODULE_LUADIR "${CMAKE_INSTALL_DATADIR}/${MODULE_SUFFIX}")
set(MODULE_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/${MODULE_SUFFIX}")
-set(MODULE_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${MODULE_LIBDIR}")
-set(MODULE_FULL_LUADIR "${CMAKE_INSTALL_PREFIX}/${MODULE_LUADIR}")
-set(MODULE_FULL_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/${MODULE_INCLUDEDIR}")
+foreach(dir
+ LIBDIR
+ LUADIR
+ INCLUDEDIR
+ )
+ if(NOT IS_ABSOLUTE ${MODULE_${dir}})
+ set(MODULE_FULL_${dir} "${CMAKE_INSTALL_PREFIX}/${MODULE_${dir}}")
+ else()
+ set(MODULE_FULL_${dir} "${MODULE_${dir}}")
+ endif()
+endforeach()
-message(STATUS "Module sources: ${MODULE_FULL_LUADIR}")
-message(STATUS "Module libraries:${MODULE_FULL_LIBDIR}")
-message(STATUS "Module includes: ${MODULE_FULL_INCLUDEDIR}")
+message(STATUS "Module sources: ${MODULE_FULL_LUADIR}")
+message(STATUS "Module libraries: ${MODULE_FULL_LIBDIR}")
+message(STATUS "Module includes: ${MODULE_FULL_INCLUDEDIR}")
list(APPEND MODULE_LUAPATH "${MODULE_FULL_LUADIR}/?.lua")
list(APPEND MODULE_LUAPATH "${MODULE_FULL_LUADIR}/?/init.lua")
--
GitLab