File 0010-remove-bundled-software.patch of Package CodeLite
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d99327f5c..37c08d090 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -928,8 +928,8 @@ add_subdirectory("${CL_SRC_ROOT}/submodules/assistant")
if(WXC_APP)
add_subdirectory(wxcrafter)
else()
- add_subdirectory(submodules/ctags)
- install(TARGETS ctags DESTINATION ${CL_INSTALL_BIN})
+ #add_subdirectory(submodules/ctags)
+ #install(TARGETS ctags DESTINATION ${CL_INSTALL_BIN})
if(MINGW)
# build wx-config for Windows
add_subdirectory(submodules/wx-config-msys2)
@@ -1027,7 +1027,7 @@ else()
add_dependencies(libcodelite databaselayersqlite wxsqlite3)
add_dependencies(plugin libcodelite)
add_dependencies(codelite plugin)
- add_dependencies(codelite ctags)
+ #add_dependencies(codelite ctags)
add_dependencies(codelite ctagsd)
add_dependencies(codelite cc-wrapper)
if(MINGW)
@@ -1059,19 +1059,19 @@ if(NOT WXC_APP)
# building CodeLite, install the SVGs
codelite_install_svgs()
- if(NOT APPLE)
- set_target_properties(ctags PROPERTIES OUTPUT_NAME "codelite-ctags")
- install(
- TARGETS ctags
- DESTINATION ${CL_PREFIX}/bin
- PERMISSIONS ${EXE_PERM})
- elseif(APPLE)
- set_target_properties(ctags PROPERTIES OUTPUT_NAME "codelite-ctags")
- install(
- TARGETS ctags
- DESTINATION ${CMAKE_BINARY_DIR}/codelite.app/Contents/MacOS
- PERMISSIONS ${EXE_PERM})
- endif()
+ #if(NOT APPLE)
+ # set_target_properties(ctags PROPERTIES OUTPUT_NAME "codelite-ctags")
+ # install(
+ # TARGETS ctags
+ # DESTINATION ${CL_PREFIX}/bin
+ # PERMISSIONS ${EXE_PERM})
+ #elseif(APPLE)
+ # set_target_properties(ctags PROPERTIES OUTPUT_NAME "codelite-ctags")
+ # install(
+ # TARGETS ctags
+ # DESTINATION ${CMAKE_BINARY_DIR}/codelite.app/Contents/MacOS
+ # PERMISSIONS ${EXE_PERM})
+ #endif()
endif()
diff --git a/CodeLite/ctags_manager.cpp b/CodeLite/ctags_manager.cpp
index 42a4e10b8..d593fbfe5 100644
--- a/CodeLite/ctags_manager.cpp
+++ b/CodeLite/ctags_manager.cpp
@@ -763,7 +763,7 @@ void TagsManager::GetCXXKeywords(wxArrayString& words)
TagEntryPtrVector_t TagsManager::ParseBuffer(const wxString& content, const wxString& filename, const wxString& kinds)
{
TagEntryPtrVector_t tagsVec;
- CTags::ParseBuffer(filename, content, clStandardPaths::Get().GetBinaryFullPath("codelite-ctags"),
+ CTags::ParseBuffer(filename, content, wxT("universal-ctags"),
GetCtagsOptions().GetTokensWxMap(), tagsVec);
return tagsVec;
}
diff --git a/LanguageServer/LanguageServerCluster.cpp b/LanguageServer/LanguageServerCluster.cpp
index 23316c6dd..0f5362525 100644
--- a/LanguageServer/LanguageServerCluster.cpp
+++ b/LanguageServer/LanguageServerCluster.cpp
@@ -615,7 +615,7 @@ void LanguageServerCluster::StartServer(const LanguageServerEntry& entry)
LSP_DEBUG() << "ctagsd: found codelite_indexer -> removing it" << endl;
}
- json.addProperty("codelite_indexer", clStandardPaths::Get().GetBinaryFullPath("codelite-ctags"));
+ json.addProperty("codelite_indexer", "universal-ctags");
json.addProperty("limit_results", TagsManagerST::Get()->GetCtagsOptions().GetCcNumberOfDisplayItems());
root.save(settings_json);
LSP_DEBUG() << "ctagsd: writing new file:" << settings_json << endl;