From 9664a6b251ebd9a857c80f4d2f71ac0e382c9ef7 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Fri, 26 Apr 2019 15:23:11 +0100 Subject: [PATCH] Don't call ldconfig in CMake scripts. Closes #1048. Thanks to Greg Troxel. --- ChangeLog.txt | 1 + lib/CMakeLists.txt | 5 ----- lib/cpp/CMakeLists.txt | 5 ----- src/CMakeLists.txt | 4 ---- 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index ffe8f967..23d47799 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -12,6 +12,7 @@ Build: - Document bundled dependencies and how to disable. Closes #1231. - Split CFLAGS and CPPFLAGS, and LDFLAGS and LDADD/LIBADD. - test/unit now respects CPPFLAGS and LDFLAGS. Closes #1232. +- Don't call ldconfig in CMake scripts. Closes #1048. 1.6 - 20190417 diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 87c4d675..836e8b17 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -111,8 +111,3 @@ if (WITH_STATIC_LIBRARIES) endif (WITH_STATIC_LIBRARIES) install(FILES mosquitto.h DESTINATION "${INCLUDEDIR}") - -if (UNIX AND NOT APPLE) - install(CODE "EXEC_PROGRAM(/sbin/ldconfig)") -endif (UNIX AND NOT APPLE) - diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt index b2d86216..f08f8201 100644 --- a/lib/cpp/CMakeLists.txt +++ b/lib/cpp/CMakeLists.txt @@ -38,8 +38,3 @@ if (WITH_STATIC_LIBRARIES) endif (WITH_STATIC_LIBRARIES) install(FILES mosquittopp.h DESTINATION "${INCLUDEDIR}") - -if (UNIX AND NOT APPLE) - install(CODE "EXEC_PROGRAM(/sbin/ldconfig)") -endif (UNIX AND NOT APPLE) - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 56ea7db1..d865fde7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -192,7 +192,3 @@ if (WITH_TLS) target_link_libraries(mosquitto_passwd ${OPENSSL_LIBRARIES}) install(TARGETS mosquitto_passwd RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}") endif (WITH_TLS) - -if (UNIX AND NOT APPLE) - install(CODE "EXEC_PROGRAM(/sbin/ldconfig)") -endif (UNIX AND NOT APPLE)