commit 6b3138a929151516a4ac1ca1fc5cec64a4673bb9
Author: Kornel Benko <[email protected]>
Date: Thu Jun 26 13:07:14 2025 +0200
Amend 2f522088: Remove support for boost library in cmake build
---
CMakeLists.txt | 11 -----------
INSTALL.cmake | 3 +--
development/cmake/configCompiler.h.cmake | 4 ----
development/cmake/modules/FindCXX11Compiler.cmake | 2 +-
src/client/CMakeLists.txt | 2 --
src/frontends/CMakeLists.txt | 2 +-
src/frontends/tests/CMakeLists.txt | 2 +-
src/support/CMakeLists.txt | 2 +-
src/support/tests/CMakeLists.txt | 1 -
src/tests/CMakeLists.txt | 8 ++++----
src/tex2lyx/CMakeLists.txt | 1 -
11 files changed, 9 insertions(+), 29 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ced1e3fba..0d33fe92df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -236,7 +236,6 @@ LYX_COMBO(EXTERNAL_MYTHES "OFF := Build 3rdparty lib
mytheslib" AUTO OFF ON)
# GCC specific
LYX_OPTION(PROFILE "Build with options for gprof"
${DefaultLyxProfile} GCC)
-LYX_OPTION(EXTERNAL_BOOST "Use external boost" ${DefaultExternalLibs}
GCC)
LYX_OPTION(PROGRAM_SUFFIX "Append version suffix to binaries" ON GCC)
LYX_OPTION(DEBUG_GLIBC "Enable libstdc++ debug mode" OFF GCC)
LYX_OPTION(DEBUG_GLIBC_PEDANTIC "Enable libstdc++ pedantic debug mode" OFF GCC)
@@ -323,11 +322,6 @@ if (LYX_ENABLE_VALGRIND_TESTS)
message(FATAL_ERROR "Cannot use valgrind tests, executable
valgrind is missing. Please disable LYX_ENABLE_VALGRIND_TESTS")
endif()
endif()
-if (LYX_DEBUG_GLIBC OR LYX_DEBUG_GLIBC_PEDANTIC OR LYX_STDLIB_DEBUG)
- if (LYX_EXTERNAL_BOOST)
- message(FATAL_ERROR "Using external boost not compatible with debug mode
for stdlib")
- endif()
-endif()
if(LYX_DMG)
set(LYX_BUNDLE ON)
@@ -985,11 +979,6 @@ if(NOT LYX_EXTERNAL_DTL)
endif()
# Set only include path.
-# Use internal boost, which is known to exist
-# we don't need any libraries
-set(Lyx_Boost_Libraries)
-add_definitions(-DBOOST_USER_CONFIG=<config.h>)
-include_directories(${TOP_SRC_DIR}/3rdparty/boost)
include_directories(${TOP_SRC_DIR}/3rdparty/nod)
diff --git a/INSTALL.cmake b/INSTALL.cmake
index 316579e834..2d49536bcf 100644
--- a/INSTALL.cmake
+++ b/INSTALL.cmake
@@ -173,7 +173,6 @@ Build options
# GCC specific
-- LYX_PROFILE = OFF : Build with options for gprof
- -- LYX_EXTERNAL_BOOST = OFF : Use external boost
-- LYX_PROGRAM_SUFFIX = ON : Append version suffix to binaries
-- LYX_DEBUG_GLIBC = OFF : Enable libstdc++ debug mode
-- LYX_DEBUG_GLIBC_PEDANTIC = OFF : Enable libstdc++ pedantic debug mode
@@ -246,7 +245,7 @@ Visual Studio C++
* for the 'Debug' and 'Release' build all precompiled headers are enabled
to compile without pch (non file merge mode) This could be used to check
if all necessary headers are included.
- * use 'MinSizeRel' which only precompiles the STL and Boost headers
+ * use 'MinSizeRel' which only precompiles the STL
* use 'RelWithDebInfo' which does not use any precompiled headers
diff --git a/development/cmake/configCompiler.h.cmake
b/development/cmake/configCompiler.h.cmake
index 6c14681528..232771aa97 100644
--- a/development/cmake/configCompiler.h.cmake
+++ b/development/cmake/configCompiler.h.cmake
@@ -80,14 +80,10 @@
#undef HAVE_MKDIR // use _mkdir instead
#endif
-#define BOOST_ALL_NO_LIB 1
-
#ifdef _DEBUG
# define ENABLE_ASSERTIONS 1
#endif
-//#define BOOST_DISABLE_THREADS 1
-
#ifdef __CYGWIN__
# define _DEFAULT_SOURCE
#endif
diff --git a/development/cmake/modules/FindCXX11Compiler.cmake
b/development/cmake/modules/FindCXX11Compiler.cmake
index ddab3a2335..00f05e3f56 100644
--- a/development/cmake/modules/FindCXX11Compiler.cmake
+++ b/development/cmake/modules/FindCXX11Compiler.cmake
@@ -36,7 +36,7 @@ INCLUDE(FindPackageHandleStandardArgs)
# get cmake-known std numbers
# Detection of c++20 works well, but our code is not ready for it yet.
-# We currently get errors with internal boost and also from our code.
+# We currently get errors with from our code.
set(_max_std_num 20)
set(_min_std_num 17)
lyxgetknowncmakestd(${_max_std_num} ${_min_std_num} tmpnums)
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 4108958836..d9be2684f9 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -16,14 +16,12 @@ list(REMOVE_ITEM _lyxclient_sources
"${TOP_SRC_DIR}/src/client/lyxclient.cpp")
include_directories(BEFORE
"${TOP_SRC_DIR}/src/client"
- "${TOP_SRC_DIR}/3rdparty/boost"
${ZLIB_INCLUDE_DIR})
add_executable(${_lyxclient} ${_lyxclient_sources} ${_lyxclient_headers})
target_link_libraries(${_lyxclient}
support
- ${Lyx_Boost_Libraries}
${ICONV_LIBRARY}
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY})
diff --git a/src/frontends/CMakeLists.txt b/src/frontends/CMakeLists.txt
index 7b5fde3667..1c11429933 100644
--- a/src/frontends/CMakeLists.txt
+++ b/src/frontends/CMakeLists.txt
@@ -22,7 +22,7 @@ else()
endif()
set_target_properties(frontends PROPERTIES FOLDER "applications/LyX"
QT_NO_UNICODE_DEFINES TRUE)
-target_link_libraries(frontends ${Lyx_Boost_Libraries})
+target_link_libraries(frontends)
project_source_group("${GROUP_CODE}" frontends_sources frontends_headers)
diff --git a/src/frontends/tests/CMakeLists.txt
b/src/frontends/tests/CMakeLists.txt
index 2ce6c44dce..3ac634cd95 100644
--- a/src/frontends/tests/CMakeLists.txt
+++ b/src/frontends/tests/CMakeLists.txt
@@ -8,7 +8,7 @@ project(testFrontends)
set(TESTS "test_biblio")
add_executable(biblio biblio.cpp)
-target_link_libraries(biblio ${Lyx_Boost_Libraries})
+target_link_libraries(biblio)
add_dependencies(lyx_run_tests biblio)
set_target_properties(biblio PROPERTIES FOLDER "tests/frontends")
diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt
index f0ce211d75..14f94bfbc8 100644
--- a/src/support/CMakeLists.txt
+++ b/src/support/CMakeLists.txt
@@ -81,7 +81,7 @@ set_target_properties(support PROPERTIES FOLDER
"applications/LyX" QT_NO_UNICODE
qt_use_modules(support Core Gui)
-target_link_libraries(support ${Lyx_Boost_Libraries} ${QT_QTCORE_LIBRARY}
${ZLIB_LIBRARY})
+target_link_libraries(support ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARY})
lyx_add_gcc_pch(support)
diff --git a/src/support/tests/CMakeLists.txt b/src/support/tests/CMakeLists.txt
index 9c371a5436..38c4ed232c 100644
--- a/src/support/tests/CMakeLists.txt
+++ b/src/support/tests/CMakeLists.txt
@@ -14,7 +14,6 @@ macro(sources _program)
set(${_program}_SOURCES ${_tmplist})
add_executable(${_program} ${_tmplist})
target_link_libraries(${_program} support
- ${Lyx_Boost_Libraries}
${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}
${ZLIB_LIBRARY} ${ICONV_LIBRARY})
lyx_target_link_libraries(${_program} Magic)
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 366a548b55..2200bbd988 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -17,7 +17,7 @@ include_directories(${TOP_SRC_DIR}/src/support/tests)
add_executable(check_layout ${check_layout_SOURCES})
target_link_libraries(check_layout support
- ${Lyx_Boost_Libraries} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}
${QtCore5CompatLibrary}
+ ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QtCore5CompatLibrary}
${ZLIB_LIBRARY} ${ICONV_LIBRARY})
if(CYGWIN)
target_link_libraries(check_layout shlwapi)
@@ -75,7 +75,7 @@ include_directories(${TOP_SRC_DIR}/src/tests)
add_executable(check_ExternalTransforms ${check_ExternalTransforms_SOURCES})
target_link_libraries(check_ExternalTransforms support
- ${Lyx_Boost_Libraries} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}
${QtCore5CompatLibrary})
+ ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QtCore5CompatLibrary})
lyx_target_link_libraries(check_ExternalTransforms Magic)
add_dependencies(lyx_run_tests check_ExternalTransforms)
@@ -96,7 +96,7 @@ endforeach()
add_executable(check_Length ${check_Length_SOURCES})
target_link_libraries(check_Length support
- ${Lyx_Boost_Libraries} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}
${QtCore5CompatLibrary})
+ ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QtCore5CompatLibrary})
lyx_target_link_libraries(check_Length Magic)
add_dependencies(lyx_run_tests check_Length)
@@ -118,7 +118,7 @@ endforeach()
add_executable(check_ListingsCaption ${check_ListingsCaption_SOURCES})
target_link_libraries(check_ListingsCaption support
- ${Lyx_Boost_Libraries} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}
${QtCore5CompatLibrary})
+ ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QtCore5CompatLibrary})
lyx_target_link_libraries(check_ListingsCaption Magic)
add_dependencies(lyx_run_tests check_ListingsCaption)
diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index 8c0a09e640..49e70f1ab8 100644
--- a/src/tex2lyx/CMakeLists.txt
+++ b/src/tex2lyx/CMakeLists.txt
@@ -46,7 +46,6 @@ set_target_properties(${_tex2lyx} PROPERTIES
target_link_libraries(${_tex2lyx}
support
- ${Lyx_Boost_Libraries}
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${ICONV_LIBRARY})
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
