Skip to content
Snippets Groups Projects
Commit 922a9e0d authored by Roman Tsisyk's avatar Roman Tsisyk
Browse files

Use "${CMAKE_INSTALL_LIBDIR}" instead of "/lib"

parent 1f390b30
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment