andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Fix CMAKE_INSTALL_LIBDIR usages.

Browse Source 
GitOrigin-RevId: 2bca91c97e868aa15ee8a65650938eda857429df
This commit is contained in:
levlam 2020-01-24 02:01:07 +03:00
parent 970cbe1c97
commit 0152d8ea2a
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CMakeLists.txt
View File

@ -4,7 +4,7 @@ project(TDLib VERSION 1.5.5 LANGUAGES CXX C)
if (NOT DEFINED CMAKE_INSTALL_LIBDIR) if (NOT DEFINED CMAKE_INSTALL_LIBDIR)
set(CMAKE_INSTALL_LIBDIR "lib") set(CMAKE_INSTALL_LIBDIR "lib")
endif(NOT DEFINED CMAKE_INSTALL_LIBDIR) endif()
if (POLICY CMP0054) if (POLICY CMP0054)
# do not expand quoted arguments # 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) add_custom_target(prepare_cross_compiling DEPENDS tl_generate_common tdmime_auto tl_generate_json)
if (TD_ENABLE_DOTNET) if (TD_ENABLE_DOTNET)
add_custom_target(remove_cpp_documentation 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 COMMAND remove_documentation ${TL_TD_AUTO} td/telegram/Client.h td/telegram/Log.h td/tl/TlObject.h
COMMENT "Remove C++ documentation from sources" 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 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() endif()
add_custom_target(git_commit ALL add_custom_target(git_commit ALL
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
COMMAND ${GIT_COMMIT_CMD} COMMAND ${GIT_COMMIT_CMD}
COMMENT "Generate git_commit.h" COMMENT "Generate git_commit.h"
) )
@ -913,8 +913,8 @@ add_library(Td::TdJson ALIAS TdJson)
add_library(Td::TdJsonStatic ALIAS TdJsonStatic) add_library(Td::TdJsonStatic ALIAS TdJsonStatic)
install(TARGETS tdjson TdJson tdjson_static TdJsonStatic tdjson_private tdclient tdcore TdStatic EXPORT TdTargets install(TARGETS tdjson TdJson tdjson_static TdJsonStatic tdjson_private tdclient tdcore TdStatic EXPORT TdTargets
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
INCLUDES DESTINATION include INCLUDES DESTINATION include
) )
@ -922,26 +922,26 @@ install(TARGETS tdjson TdJson tdjson_static TdJsonStatic tdjson_private tdclient
install(EXPORT TdTargets install(EXPORT TdTargets
FILE TdTargets.cmake FILE TdTargets.cmake
NAMESPACE Td:: 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/telegram/Client.h td/telegram/Log.h DESTINATION include/td/telegram)
install(FILES td/tl/TlObject.h DESTINATION include/td/tl) 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) if (TD_ENABLE_JNI)
install(FILES td/tl/tl_jni_object.h DESTINATION include/td/tl) install(FILES td/tl/tl_jni_object.h DESTINATION include/td/tl)
endif() endif()
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
write_basic_package_version_file("TdConfigVersion.cmake" write_basic_package_version_file("TdConfigVersion.cmake"
VERSION ${TDLib_VERSION} VERSION "${TDLib_VERSION}"
COMPATIBILITY ExactVersion COMPATIBILITY ExactVersion
) )
install(FILES "TdConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/TdConfigVersion.cmake" 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 # Add SOVERSION to shared libraries
set_property(TARGET tdclient PROPERTY SOVERSION ${TDLib_VERSION}) set_property(TARGET tdclient PROPERTY SOVERSION "${TDLib_VERSION}")
set_property(TARGET tdjson PROPERTY SOVERSION ${TDLib_VERSION}) set_property(TARGET tdjson PROPERTY SOVERSION "${TDLib_VERSION}")

4
sqlite/CMakeLists.txt
View File

@ -45,8 +45,8 @@ elseif (MSVC)
endif() endif()
install(TARGETS tdsqlite EXPORT TdTargets install(TARGETS tdsqlite EXPORT TdTargets
LIBRARY DESTINATION lib LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION lib ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
INCLUDES DESTINATION include INCLUDES DESTINATION include
) )

4
tdactor/CMakeLists.txt
View File

@ -50,8 +50,8 @@ if (NOT CMAKE_CROSSCOMPILING)
endif() endif()
install(TARGETS tdactor EXPORT TdTargets install(TARGETS tdactor EXPORT TdTargets
LIBRARY DESTINATION lib LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION lib ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
INCLUDES DESTINATION include INCLUDES DESTINATION include
) )

4
tddb/CMakeLists.txt
View File

@ -50,8 +50,8 @@ if (NOT CMAKE_CROSSCOMPILING)
endif() endif()
install(TARGETS tddb EXPORT TdTargets install(TARGETS tddb EXPORT TdTargets
LIBRARY DESTINATION lib LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION lib ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
INCLUDES DESTINATION include INCLUDES DESTINATION include
) )

4
tdnet/CMakeLists.txt
View File

@ -59,8 +59,8 @@ if (WIN32)
endif() endif()
install(TARGETS tdnet EXPORT TdTargets install(TARGETS tdnet EXPORT TdTargets
LIBRARY DESTINATION lib LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION lib ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
INCLUDES DESTINATION include INCLUDES DESTINATION include
) )

4
tdutils/CMakeLists.txt
View File

@ -326,8 +326,8 @@ if (CMAKE_HOST_SYSTEM_NAME MATCHES "NetBSD")
endif() endif()
install(TARGETS tdutils EXPORT TdTargets install(TARGETS tdutils EXPORT TdTargets
LIBRARY DESTINATION lib LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION lib ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
INCLUDES DESTINATION include INCLUDES DESTINATION include
) )