feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Remove libclang references

Browse Source 
Now that libclang is no longer used, make sure that all references
to libclang are gone.

Change-Id: I4b66eff992b22adb6a9c25d34053f2b36079583c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Cristian Adam
2022-05-24 12:43:57 +02:00
parent f117c2a37b
commit ee98c98676
4 changed files with 5 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmake/FindClang.cmake
View File

@@ -1,21 +1,12 @@
find_package(Clang CONFIG) find_package(Clang CONFIG)
# silence a lot of warnings from building against llvm
if(MSVC AND TARGET libclang)
target_compile_options(libclang INTERFACE /wd4267)
endif()
option(CLANGTOOLING_LINK_CLANG_DYLIB "Force linking of Clang tooling against clang-cpp" NO) option(CLANGTOOLING_LINK_CLANG_DYLIB "Force linking of Clang tooling against clang-cpp" NO)
if (TARGET clangTooling AND NOT CLANGTOOLING_LINK_CLANG_DYLIB) set(CLANG_FORMAT_LIB clangFormat)
set(CLANG_TOOLING_LIBS libclang clangTooling clangQuery clangIndex) if (TARGET clang-cpp AND CLANGTOOLING_LINK_CLANG_DYLIB)
set(CLANG_FORMAT_LIB clangFormat)
elseif (TARGET clang-cpp)
set(CLANG_TOOLING_LIBS libclang clang-cpp)
set(CLANG_FORMAT_LIB clang-cpp) set(CLANG_FORMAT_LIB clang-cpp)
endif() endif()
if (WIN32 AND TARGET clangTooling) if (WIN32 AND TARGET clangTooling)
# check that we can compile against clangTooling # check that we can compile against clangTooling
# which requires the build modes to be compatible # which requires the build modes to be compatible

2
src/plugins/clangformat/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(ClangFormat add_qtc_plugin(ClangFormat
CONDITION TARGET libclang AND LLVM_PACKAGE_VERSION VERSION_GREATER_EQUAL 10.0.0 AND (QTC_CLANG_BUILDMODE_MATCH OR CLANGTOOLING_LINK_CLANG_DYLIB) CONDITION TARGET ${CLANG_FORMAT_LIB} AND LLVM_PACKAGE_VERSION VERSION_GREATER_EQUAL 10.0.0 AND (QTC_CLANG_BUILDMODE_MATCH OR CLANGTOOLING_LINK_CLANG_DYLIB)
DEPENDS Utils Qt5::Widgets ${CLANG_FORMAT_LIB} DEPENDS Utils Qt5::Widgets ${CLANG_FORMAT_LIB}
PLUGIN_DEPENDS Core TextEditor CppEditor ProjectExplorer PLUGIN_DEPENDS Core TextEditor CppEditor ProjectExplorer
SOURCES SOURCES

4
src/plugins/projectexplorer/CMakeLists.txt
View File

@@ -191,8 +191,8 @@ extend_qtc_plugin(ProjectExplorer
DEFINES "PROJECT_USER_FILE_EXTENSION=${PROJECT_USER_FILE_EXTENSION}" DEFINES "PROJECT_USER_FILE_EXTENSION=${PROJECT_USER_FILE_EXTENSION}"
) )
if (TARGET libclang) if (TARGET clangd)
set(CLANG_BINDIR "$<TARGET_FILE_DIR:libclang>") set(CLANG_BINDIR "$<TARGET_FILE_DIR:clangd>")
endif() endif()
extend_qtc_plugin(ProjectExplorer extend_qtc_plugin(ProjectExplorer
DEFINES "CLANG_BINDIR=\"${CLANG_BINDIR}\"" DEFINES "CLANG_BINDIR=\"${CLANG_BINDIR}\""

15
tests/unit/unittest/CMakeLists.txt
View File

@@ -1,12 +1,3 @@
if (TARGET libclang)
set(HAVE_LIBCLANG ON)
endif()
if (HAVE_LIBCLANG AND NOT QTC_CLANG_BUILDMODE_MATCH)
message(STATUS "Disabling libclang tests due to build mode mismatch.")
set(HAVE_LIBCLANG OFF)
endif()
find_package(Googletest MODULE) find_package(Googletest MODULE)
find_package(GoogleBenchmark MODULE) find_package(GoogleBenchmark MODULE)
@@ -151,15 +142,9 @@ add_custom_command(TARGET unittest POST_BUILD
) )
extend_qtc_test(unittest extend_qtc_test(unittest
CONDITION HAVE_LIBCLANG
INCLUDES "${CLANG_INCLUDE_DIRS}"
DEFINES CLANG_UNIT_TESTS
DEPENDS libclang
SOURCES SOURCES
activationsequenceprocessor-test.cpp activationsequenceprocessor-test.cpp
readexporteddiagnostics-test.cpp readexporteddiagnostics-test.cpp
clangcompareoperators.h
diagnosticcontainer-matcher.h
) )
extend_qtc_test(unittest extend_qtc_test(unittest