From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 7C4F44429E1 for ; Thu, 11 Jun 2020 03:25:29 +0300 (MSK) Received: by mail-lj1-f170.google.com with SMTP id x18so4789829lji.1 for ; Wed, 10 Jun 2020 17:25:29 -0700 (PDT) From: HustonMmmavr Date: Thu, 11 Jun 2020 03:25:10 +0300 Message-Id: <20200611002510.35349-1-huston.mavr@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH] cmake: cleanup src/CMakeLists.txt List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org, yaroslav.dynnikov@gmail.com, avtikhon@tarantool.org, alexander.turenko@tarantool.org Removed definition and initialization of EXPORT_LIST variable at file src/CMakeLists.txt. After patch 03790ac551 this variable is unused (no reference to this variable after its initialization can be found in whole project) and it is only misleading. Closes #5066 --- I've builded tarantool before applying this changes and after. Then I've checked difference in tarantool binary file symbols with nm and diff commands and there was no difference. Issue: https://github.com/tarantool/tarantool/issues/5066 Branch: https://github.com/tarantool/tarantool/tree/HustonMmmavr/gh-5066-delete-unusued-export-list @ChangeLog - Cleanup src/CMakeLists.txt (gh-5066) src/CMakeLists.txt | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7099e9bef..d86e6bfb1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -213,33 +213,7 @@ add_subdirectory(box) set(TARANTOOL_C_FLAGS ${CMAKE_C_FLAGS} PARENT_SCOPE) set(TARANTOOL_CXX_FLAGS ${CMAKE_CXX_FLAGS} PARENT_SCOPE) -set(EXPORT_LIST) if(BUILD_STATIC) - # for each static library we should find a corresponding shared library to - # parse and reexport library api functions - foreach(libstatic - ${READLINE_LIBRARIES} - ${CURL_LIBRARIES} - ${OPENSSL_LIBRARIES} - ${ICU_LIBRARIES}) - if (${libstatic} MATCHES "lib[^/]+.a") - string(REGEX MATCH "lib[^/]+.a" libname ${libstatic}) - string(REGEX REPLACE "\\.a$" "" libname ${libname}) - string(REGEX REPLACE "^lib" "" libname ${libname}) - find_library(SYMBOLS_LIB NAMES ${libname}) - # add found library to export list - list(APPEND EXPORT_LIST ${SYMBOLS_LIB}) - # set variable to allow rescan (CMake depended) - set(SYMBOLS_LIB "SYMBOLS_LIB-NOTFOUND") - elseif (${libstatic} STREQUAL bundled-libcurl OR - ${libstatic} STREQUAL bundled-ares) - message("We don't need to export symbols from statically linked ${libstatic}, skipped") - else() - message(WARNING "${libstatic} should be a static") - endif() - endforeach(libstatic) - string(REPLACE ";" " " EXPORT_LIST "${EXPORT_LIST}") - if (HAVE_OPENMP) # Link libgomp explicitly to make it static. Avoid linking # against DSO version of libgomp, which implied by -fopenmp -- 2.26.2