From f40b4e50f69924cfd9ebe56d9cea3b5eb401c4be Mon Sep 17 00:00:00 2001
From: David Abdurachmanov <David.Abdurachmanov@cern.ch>
Date: Tue, 10 Nov 2015 17:10:20 +0100
Subject: [PATCH] CMake: remove CMAKE_TINFO_LIBS
There is no direct usage of terminfo library (ncurses) in ROOT. LLVM
uses it for color support. If LLVM detects tinfo library, tinfo will be
added for rootcling_tmp, rootcling, and libCling.so targets. Thus
explicit check for tinfo is not required.
This allows to use -DLLVM_ENABLE_TERMINFO=OFF to disable ncurses for
ROOT.
Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>
---
cmake/modules/SearchInstalledSoftware.cmake | 6 ------
core/meta/CMakeLists.txt | 2 +-
core/utils/CMakeLists.txt | 4 ++--
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
index dca2955d5f1..24a391ad1c1 100644
--- a/cmake/modules/SearchInstalledSoftware.cmake
+++ b/cmake/modules/SearchInstalledSoftware.cmake
@@ -703,12 +703,6 @@ else()
endif()
#---Check for cling and llvm --------------------------------------------------------
-find_library(CMAKE_TINFO_LIBS NAMES tinfo ncurses)
-mark_as_advanced(CMAKE_TINFO_LIBS)
-if(NOT CMAKE_TINFO_LIBS)
- set(CMAKE_TINFO_LIBS "") # Often if not found is still OK
-endif()
-
if(cling)
if(builtin_llvm)
set(LLVM_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/interpreter/llvm/src/include
diff --git a/core/meta/CMakeLists.txt b/core/meta/CMakeLists.txt
index 8adc2e99947..c640235e9c4 100644
--- a/core/meta/CMakeLists.txt
+++ b/core/meta/CMakeLists.txt
@@ -33,7 +33,7 @@ ROOT_LINKER_LIBRARY(Cling
${CMAKE_SOURCE_DIR}/core/metautils/src/TMetaUtils.cxx
$<TARGET_OBJECTS:MetaLLVM>
$<TARGET_OBJECTS:MetaUtilsLLVM>
- LIBRARIES ${CLING_LIBRARIES} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_TINFO_LIBS}
+ LIBRARIES ${CLING_LIBRARIES} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
DEPENDENCIES Core RIO)
ROOT_INSTALL_HEADERS()
diff --git a/core/utils/CMakeLists.txt b/core/utils/CMakeLists.txt
index 6c120f8eea7..6c879b148e6 100644
--- a/core/utils/CMakeLists.txt
+++ b/core/utils/CMakeLists.txt
@@ -34,7 +34,7 @@ ROOT_EXECUTABLE(rootcling src/LinkdefReader.cxx src/DictSelectionReader.cxx
${winnt_objects}
LIBRARIES ${PCRE_LIBRARIES} ${LZMA_LIBRARIES} ${ZLIB_LIBRARY}
${CLING_LIBRARIES} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
- ${CMAKE_TINFO_LIBS} ${corelinklibs})
+ ${corelinklibs})
add_dependencies(rootcling CLING LLVMRES)
@@ -83,7 +83,7 @@ ROOT_EXECUTABLE(rootcling_tmp src/LinkdefReader.cxx src/DictSelectionReader.cxx
$<TARGET_OBJECTS:Clib>
$<TARGET_OBJECTS:MetaUtils>
$<TARGET_OBJECTS:MetaUtilsLLVM>
- LIBRARIES ${CLING_LIBRARIES} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_TINFO_LIBS}
+ LIBRARIES ${CLING_LIBRARIES} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
NOINSTALL)
add_dependencies(rootcling_tmp CLING LLVMRES)
set_source_files_properties(src/LinkdefReader.cxx PROPERTIES COMPILE_FLAGS -fno-rtti)
--
GitLab