From 0152d8ea2ade466c6f9dd9a298a79095de4aec40 Mon Sep 17 00:00:00 2001 From: levlam Date: Fri, 24 Jan 2020 02:01:07 +0300 Subject: [PATCH] Fix CMAKE_INSTALL_LIBDIR usages. GitOrigin-RevId: 2bca91c97e868aa15ee8a65650938eda857429df --- CMakeLists.txt | 24 ++++++++++++------------ sqlite/CMakeLists.txt | 4 ++-- tdactor/CMakeLists.txt | 4 ++-- tddb/CMakeLists.txt | 4 ++-- tdnet/CMakeLists.txt | 4 ++-- tdutils/CMakeLists.txt | 4 ++-- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 26a639bcb..b8a8f73fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(TDLib VERSION 1.5.5 LANGUAGES CXX C) if (NOT DEFINED CMAKE_INSTALL_LIBDIR) set(CMAKE_INSTALL_LIBDIR "lib") -endif(NOT DEFINED CMAKE_INSTALL_LIBDIR) +endif() if (POLICY CMP0054) # do not expand quoted arguments @@ -255,7 +255,7 @@ if (NOT CMAKE_CROSSCOMPILING) add_custom_target(prepare_cross_compiling DEPENDS tl_generate_common tdmime_auto tl_generate_json) if (TD_ENABLE_DOTNET) add_custom_target(remove_cpp_documentation - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" COMMAND remove_documentation ${TL_TD_AUTO} td/telegram/Client.h td/telegram/Log.h td/tl/TlObject.h COMMENT "Remove C++ documentation from sources" DEPENDS remove_documentation tl_generate_common generate_dotnet_api ${TL_TD_AUTO} td/telegram/Client.h td/telegram/Log.h td/tl/TlObject.h @@ -709,7 +709,7 @@ else() endif() add_custom_target(git_commit ALL - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" COMMAND ${GIT_COMMIT_CMD} COMMENT "Generate git_commit.h" ) @@ -913,8 +913,8 @@ add_library(Td::TdJson ALIAS TdJson) add_library(Td::TdJsonStatic ALIAS TdJsonStatic) install(TARGETS tdjson TdJson tdjson_static TdJsonStatic tdjson_private tdclient tdcore TdStatic EXPORT TdTargets - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" RUNTIME DESTINATION bin INCLUDES DESTINATION include ) @@ -922,26 +922,26 @@ install(TARGETS tdjson TdJson tdjson_static TdJsonStatic tdjson_private tdclient install(EXPORT TdTargets FILE TdTargets.cmake NAMESPACE Td:: - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Td + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Td" ) -install(FILES ${TD_JSON_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/td/telegram/tdjson_export.h DESTINATION include/td/telegram) +install(FILES ${TD_JSON_HEADERS} "${CMAKE_CURRENT_BINARY_DIR}/td/telegram/tdjson_export.h" DESTINATION include/td/telegram) install(FILES td/telegram/Client.h td/telegram/Log.h DESTINATION include/td/telegram) install(FILES td/tl/TlObject.h DESTINATION include/td/tl) -install(FILES ${TL_TD_AUTO_INCLUDES}/td/telegram/td_api.h ${TL_TD_AUTO_INCLUDES}/td/telegram/td_api.hpp DESTINATION include/td/telegram) +install(FILES "${TL_TD_AUTO_INCLUDES}/td/telegram/td_api.h" "${TL_TD_AUTO_INCLUDES}/td/telegram/td_api.hpp" DESTINATION include/td/telegram) if (TD_ENABLE_JNI) install(FILES td/tl/tl_jni_object.h DESTINATION include/td/tl) endif() include(CMakePackageConfigHelpers) write_basic_package_version_file("TdConfigVersion.cmake" - VERSION ${TDLib_VERSION} + VERSION "${TDLib_VERSION}" COMPATIBILITY ExactVersion ) install(FILES "TdConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/TdConfigVersion.cmake" - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Td + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Td" ) # Add SOVERSION to shared libraries -set_property(TARGET tdclient PROPERTY SOVERSION ${TDLib_VERSION}) -set_property(TARGET tdjson PROPERTY SOVERSION ${TDLib_VERSION}) +set_property(TARGET tdclient PROPERTY SOVERSION "${TDLib_VERSION}") +set_property(TARGET tdjson PROPERTY SOVERSION "${TDLib_VERSION}") diff --git a/sqlite/CMakeLists.txt b/sqlite/CMakeLists.txt index 4b63c0088..1ce924a9a 100644 --- a/sqlite/CMakeLists.txt +++ b/sqlite/CMakeLists.txt @@ -45,8 +45,8 @@ elseif (MSVC) endif() install(TARGETS tdsqlite EXPORT TdTargets - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" RUNTIME DESTINATION bin INCLUDES DESTINATION include ) diff --git a/tdactor/CMakeLists.txt b/tdactor/CMakeLists.txt index 7583c1e5c..44e029bfa 100644 --- a/tdactor/CMakeLists.txt +++ b/tdactor/CMakeLists.txt @@ -50,8 +50,8 @@ if (NOT CMAKE_CROSSCOMPILING) endif() install(TARGETS tdactor EXPORT TdTargets - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" RUNTIME DESTINATION bin INCLUDES DESTINATION include ) diff --git a/tddb/CMakeLists.txt b/tddb/CMakeLists.txt index 34a47c581..7090cb9b7 100644 --- a/tddb/CMakeLists.txt +++ b/tddb/CMakeLists.txt @@ -50,8 +50,8 @@ if (NOT CMAKE_CROSSCOMPILING) endif() install(TARGETS tddb EXPORT TdTargets - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" RUNTIME DESTINATION bin INCLUDES DESTINATION include ) diff --git a/tdnet/CMakeLists.txt b/tdnet/CMakeLists.txt index bebbe9dd6..2b293cb96 100644 --- a/tdnet/CMakeLists.txt +++ b/tdnet/CMakeLists.txt @@ -59,8 +59,8 @@ if (WIN32) endif() install(TARGETS tdnet EXPORT TdTargets - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" RUNTIME DESTINATION bin INCLUDES DESTINATION include ) diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt index d34b7f761..172823602 100644 --- a/tdutils/CMakeLists.txt +++ b/tdutils/CMakeLists.txt @@ -326,8 +326,8 @@ if (CMAKE_HOST_SYSTEM_NAME MATCHES "NetBSD") endif() install(TARGETS tdutils EXPORT TdTargets - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" RUNTIME DESTINATION bin INCLUDES DESTINATION include )