From 922a9e0d6f5a2043e539807bc3d5643aca238261 Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Thu, 23 May 2013 16:48:07 +0400
Subject: [PATCH] Use "${CMAKE_INSTALL_LIBDIR}" instead of "/lib"
---
CMakeLists.txt | 4 ++++
connector/c/tnt/CMakeLists.txt | 4 ++--
connector/c/tntnet/CMakeLists.txt | 4 ++--
connector/c/tntrpl/CMakeLists.txt | 4 ++--
connector/c/tntsql/CMakeLists.txt | 4 ++--
5 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76583b8e17..b5b0f577b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,10 @@ if(NOT CMAKE_BUILD_TYPE)
FORCE)
endif()
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+ set(CMAKE_INSTALL_LIBDIR lib)
+endif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+
set(CMAKE_OBJC_FLAGS)
set(CMAKE_OBJCXX_FLAGS)
diff --git a/connector/c/tnt/CMakeLists.txt b/connector/c/tnt/CMakeLists.txt
index 657f203a4c..1eb1ca719b 100644
--- a/connector/c/tnt/CMakeLists.txt
+++ b/connector/c/tnt/CMakeLists.txt
@@ -75,6 +75,6 @@ set_target_properties(tnt_shared PROPERTIES OUTPUT_NAME "tarantool")
#----------------------------------------------------------------------------#
# install static library
-install_targets(/lib tnt)
+install_targets(/${CMAKE_INSTALL_LIBDIR} tnt)
# install shared library
-install_targets(/lib tnt_shared)
+install_targets(/${CMAKE_INSTALL_LIBDIR} tnt_shared)
diff --git a/connector/c/tntnet/CMakeLists.txt b/connector/c/tntnet/CMakeLists.txt
index 18c2830d44..ec69e40d5c 100644
--- a/connector/c/tntnet/CMakeLists.txt
+++ b/connector/c/tntnet/CMakeLists.txt
@@ -67,6 +67,6 @@ set_target_properties(tntnet_shared PROPERTIES OUTPUT_NAME "tarantoolnet")
#----------------------------------------------------------------------------#
# install static library
-install_targets(/lib tntnet)
+install_targets(/${CMAKE_INSTALL_LIBDIR} tntnet)
# install shared library
-install_targets(/lib tntnet_shared)
+install_targets(/${CMAKE_INSTALL_LIBDIR} tntnet_shared)
diff --git a/connector/c/tntrpl/CMakeLists.txt b/connector/c/tntrpl/CMakeLists.txt
index 42594df340..8e221dacd6 100644
--- a/connector/c/tntrpl/CMakeLists.txt
+++ b/connector/c/tntrpl/CMakeLists.txt
@@ -66,6 +66,6 @@ set_target_properties(tntrpl_shared PROPERTIES OUTPUT_NAME "tarantoolrpl")
#----------------------------------------------------------------------------#
# install static library
-install_targets(/lib tntrpl)
+install_targets(/${CMAKE_INSTALL_LIBDIR} tntrpl)
# install shared library
-install_targets(/lib tntrpl_shared)
+install_targets(/${CMAKE_INSTALL_LIBDIR} tntrpl_shared)
diff --git a/connector/c/tntsql/CMakeLists.txt b/connector/c/tntsql/CMakeLists.txt
index 2ff74dd62e..d1664361b7 100644
--- a/connector/c/tntsql/CMakeLists.txt
+++ b/connector/c/tntsql/CMakeLists.txt
@@ -68,6 +68,6 @@ set_target_properties(tntsql_shared PROPERTIES OUTPUT_NAME "tarantoolsql")
#----------------------------------------------------------------------------#
# install static library
-install_targets(/lib tntsql)
+install_targets(/${CMAKE_INSTALL_LIBDIR} tntsql)
# install shared library
-install_targets(/lib tntsql_shared)
+install_targets(/${CMAKE_INSTALL_LIBDIR} tntsql_shared)
--
GitLab