Skip to content

Commit 3fe8ee2

Browse files
committed
chore: Only install tox_private.h on request.
Unfortunately, events and dispatch are already installed in .18, so we can't stop, but for .19, let's not add this private header if there's the possibility of moving it to a different location (TokTok#2599). Installing it makes it a chore for package maintainers (debian, pkgsrc).
1 parent 9a8dfa0 commit 3fe8ee2

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ if(MIN_LOGGER_LEVEL)
136136
endif()
137137
endif()
138138

139+
option(EXPERIMENTAL_API "Install experimental header file with unstable API" OFF)
140+
139141
option(USE_IPV6 "Use IPv6 in tests" ON)
140142
if(NOT USE_IPV6)
141143
add_definitions(-DUSE_IPV6=0)
@@ -359,8 +361,11 @@ set(toxcore_PKGCONFIG_REQUIRES ${toxcore_PKGCONFIG_REQUIRES} libsodium)
359361
set(toxcore_API_HEADERS
360362
${toxcore_SOURCE_DIR}/toxcore/tox.h^tox
361363
${toxcore_SOURCE_DIR}/toxcore/tox_events.h^tox
362-
${toxcore_SOURCE_DIR}/toxcore/tox_dispatch.h^tox
363-
${toxcore_SOURCE_DIR}/toxcore/tox_private.h^tox)
364+
${toxcore_SOURCE_DIR}/toxcore/tox_dispatch.h^tox)
365+
if(EXPERIMENTAL_API)
366+
set(toxcore_API_HEADERS ${toxcore_API_HEADERS}
367+
${toxcore_SOURCE_DIR}/toxcore/tox_private.h^tox)
368+
endif()
364369

365370
################################################################################
366371
#

toxcore/Makefile.inc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
lib_LTLIBRARIES += libtoxcore.la
22

33
libtoxcore_la_include_HEADERS = \
4-
../toxcore/tox.h \
5-
../toxcore/tox_private.h
4+
../toxcore/tox.h
65

76
libtoxcore_la_includedir = $(includedir)/tox
87

0 commit comments

Comments
 (0)