From 13b91f5afb16474808fc3957921f29d1ea175df6 Mon Sep 17 00:00:00 2001 From: "Max Drosdo.www" Date: Tue, 16 Jun 2020 15:22:46 +0300 Subject: [PATCH] removed legacy cmake libsdir entry (#24813) (cherry picked from commit 60e813df6b7dfe599266cf36ddd52ba204917267) (cherry picked from commit aa409f8993f3ee5e90dd64511f34504ebafec7d1) --- cmake/platform/unix/settings.cmake | 6 ------ cmake/showoptions.cmake | 3 --- doc/UnixInstall.txt | 1 - 3 files changed, 10 deletions(-) diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake index 8e882709ce..51e0955977 100644 --- a/cmake/platform/unix/settings.cmake +++ b/cmake/platform/unix/settings.cmake @@ -4,12 +4,6 @@ if(NOT CONF_DIR) message(STATUS "UNIX: Using default configuration directory") endif() -# set default library directory -if( NOT LIBSDIR ) - set(LIBSDIR ${CMAKE_INSTALL_PREFIX}/lib) - message(STATUS "UNIX: Using default library directory") -endif() - # configure uninstaller configure_file( "${CMAKE_SOURCE_DIR}/cmake/platform/cmake_uninstall.in.cmake" diff --git a/cmake/showoptions.cmake b/cmake/showoptions.cmake index ddb8fc0c89..fbf27a069a 100644 --- a/cmake/showoptions.cmake +++ b/cmake/showoptions.cmake @@ -9,9 +9,6 @@ message("") # output information about installation-directories and locations message("* Install core to : ${CMAKE_INSTALL_PREFIX}") -if(UNIX) - message("* Install libraries to : ${LIBSDIR}") -endif() message("") # Show infomation about the options selected during configuration diff --git a/doc/UnixInstall.txt b/doc/UnixInstall.txt index c4843a10ca..a1ad4c3d9a 100644 --- a/doc/UnixInstall.txt +++ b/doc/UnixInstall.txt @@ -59,7 +59,6 @@ flags like PREFIX Set installation directory NOJEM Do not build with jemalloc (advanced users only) CONF_DIR Set path as default configuration directory - LIBSDIR Set path as default library directory CMAKE_C_FLAGS Set C_FLAGS for compile (advanced users only) CMAKE_CXX_FLAGS Set CXX_FLAGS for compile (advanced users only) CMAKE_BUILD_TYPE Set buildtype - the supported modes are :