Skip to content

Commit 0198711

Browse files
committed
Allow to change CMAKE_INSTALL_BINDIR and CMAKE_INSTALL_INCLUDEDIR.
GitOrigin-RevId: 5704095d127c7fcf2450133745ab2ac546a1177f
1 parent 0152d8e commit 0198711

File tree

7 files changed

+40
-20
lines changed

7 files changed

+40
-20
lines changed

CMakeLists.txt

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ project(TDLib VERSION 1.5.5 LANGUAGES CXX C)
55
if (NOT DEFINED CMAKE_INSTALL_LIBDIR)
66
set(CMAKE_INSTALL_LIBDIR "lib")
77
endif()
8+
if (NOT DEFINED CMAKE_INSTALL_BINDIR)
9+
set(CMAKE_INSTALL_BINDIR "bin")
10+
endif()
11+
if (NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
12+
set(CMAKE_INSTALL_INCLUDEDIR "include")
13+
endif()
814

915
if (POLICY CMP0054)
1016
# do not expand quoted arguments
@@ -915,8 +921,8 @@ add_library(Td::TdJsonStatic ALIAS TdJsonStatic)
915921
install(TARGETS tdjson TdJson tdjson_static TdJsonStatic tdjson_private tdclient tdcore TdStatic EXPORT TdTargets
916922
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
917923
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
918-
RUNTIME DESTINATION bin
919-
INCLUDES DESTINATION include
924+
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
925+
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
920926
)
921927

922928
install(EXPORT TdTargets
@@ -925,12 +931,12 @@ install(EXPORT TdTargets
925931
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Td"
926932
)
927933

928-
install(FILES ${TD_JSON_HEADERS} "${CMAKE_CURRENT_BINARY_DIR}/td/telegram/tdjson_export.h" DESTINATION include/td/telegram)
929-
install(FILES td/telegram/Client.h td/telegram/Log.h DESTINATION include/td/telegram)
930-
install(FILES td/tl/TlObject.h DESTINATION include/td/tl)
931-
install(FILES "${TL_TD_AUTO_INCLUDES}/td/telegram/td_api.h" "${TL_TD_AUTO_INCLUDES}/td/telegram/td_api.hpp" DESTINATION include/td/telegram)
934+
install(FILES ${TD_JSON_HEADERS} "${CMAKE_CURRENT_BINARY_DIR}/td/telegram/tdjson_export.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/td/telegram")
935+
install(FILES td/telegram/Client.h td/telegram/Log.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/td/telegram")
936+
install(FILES td/tl/TlObject.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/td/tl")
937+
install(FILES "${TL_TD_AUTO_INCLUDES}/td/telegram/td_api.h" "${TL_TD_AUTO_INCLUDES}/td/telegram/td_api.hpp" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/td/telegram")
932938
if (TD_ENABLE_JNI)
933-
install(FILES td/tl/tl_jni_object.h DESTINATION include/td/tl)
939+
install(FILES td/tl/tl_jni_object.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/td/tl")
934940
endif()
935941

936942
include(CMakePackageConfigHelpers)

sqlite/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
22

3+
if (NOT DEFINED CMAKE_INSTALL_LIBDIR)
4+
set(CMAKE_INSTALL_LIBDIR "lib")
5+
endif()
6+
37
if (NOT OPENSSL_FOUND)
48
find_package(OpenSSL REQUIRED)
59
find_package(ZLIB REQUIRED)
@@ -47,6 +51,4 @@ endif()
4751
install(TARGETS tdsqlite EXPORT TdTargets
4852
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
4953
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
50-
RUNTIME DESTINATION bin
51-
INCLUDES DESTINATION include
5254
)

td/generate/CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
22

3+
if (NOT DEFINED CMAKE_INSTALL_BINDIR)
4+
set(CMAKE_INSTALL_BINDIR "bin")
5+
endif()
6+
37
file(MAKE_DIRECTORY auto/td/telegram)
48
file(MAKE_DIRECTORY auto/td/mtproto)
59

@@ -129,9 +133,9 @@ if (NOT CMAKE_CROSSCOMPILING)
129133
)
130134

131135
if (TD_ENABLE_JNI)
132-
install(TARGETS td_generate_java_api RUNTIME DESTINATION bin)
133-
install(FILES JavadocTlDocumentationGenerator.php TlDocumentationGenerator.php DESTINATION bin/td/generate)
134-
install(FILES scheme/td_api.tlo scheme/td_api.tl DESTINATION bin/td/generate/scheme)
136+
install(TARGETS td_generate_java_api RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
137+
install(FILES JavadocTlDocumentationGenerator.php TlDocumentationGenerator.php DESTINATION "${CMAKE_INSTALL_BINDIR}/td/generate")
138+
install(FILES scheme/td_api.tlo scheme/td_api.tl DESTINATION "${CMAKE_INSTALL_BINDIR}/td/generate/scheme")
135139
endif()
136140

137141
if (TD_ENABLE_DOTNET)

tdactor/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
22

3+
if (NOT DEFINED CMAKE_INSTALL_LIBDIR)
4+
set(CMAKE_INSTALL_LIBDIR "lib")
5+
endif()
6+
37
#SOURCE SETS
48
set(TDACTOR_SOURCE
59
td/actor/impl/ConcurrentScheduler.cpp
@@ -52,6 +56,4 @@ endif()
5256
install(TARGETS tdactor EXPORT TdTargets
5357
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
5458
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
55-
RUNTIME DESTINATION bin
56-
INCLUDES DESTINATION include
5759
)

tddb/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
22

3+
if (NOT DEFINED CMAKE_INSTALL_LIBDIR)
4+
set(CMAKE_INSTALL_LIBDIR "lib")
5+
endif()
6+
37
#SOURCE SETS
48
set(TDDB_SOURCE
59
td/db/binlog/Binlog.cpp
@@ -52,6 +56,4 @@ endif()
5256
install(TARGETS tddb EXPORT TdTargets
5357
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
5458
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
55-
RUNTIME DESTINATION bin
56-
INCLUDES DESTINATION include
5759
)

tdnet/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
22

3+
if (NOT DEFINED CMAKE_INSTALL_LIBDIR)
4+
set(CMAKE_INSTALL_LIBDIR "lib")
5+
endif()
6+
37
if (NOT OPENSSL_FOUND)
48
find_package(OpenSSL REQUIRED)
59
find_package(ZLIB REQUIRED)
@@ -61,6 +65,4 @@ endif()
6165
install(TARGETS tdnet EXPORT TdTargets
6266
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
6367
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
64-
RUNTIME DESTINATION bin
65-
INCLUDES DESTINATION include
6668
)

tdutils/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
22

3+
if (NOT DEFINED CMAKE_INSTALL_LIBDIR)
4+
set(CMAKE_INSTALL_LIBDIR "lib")
5+
endif()
6+
37
if (WIN32)
48
if (WINGETOPT_FOUND)
59
set(TD_HAVE_GETOPT 1)
@@ -328,6 +332,4 @@ endif()
328332
install(TARGETS tdutils EXPORT TdTargets
329333
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
330334
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
331-
RUNTIME DESTINATION bin
332-
INCLUDES DESTINATION include
333335
)

0 commit comments

Comments
 (0)