diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2017-12-05 17:58:13 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2017-12-05 17:58:13 +0300 |
| commit | ed5385faa36cd21ac9645f896d13fde8bd53bd2e (patch) | |
| tree | 962dac1378476972140b838bcd81c6b9dc9e28b8 /CMakeLists.txt | |
| parent | fe234499ddf8363f9ae3259f229063d7580d5980 (diff) | |
| parent | 67d77dd6ced176dc29adff316edb037ed9a687b8 (diff) | |
Merge remote-tracking branch 'origin/2.4'
Conflicts:
src/libsync/connectionvalidator.cpp
src/libsync/networkjobs.cpp
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 85a14bd7f..a628ed780 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -246,6 +246,7 @@ set(WITH_TESTING ${UNIT_TESTING}) if(BUILD_CLIENT) add_subdirectory(src) if(NOT BUILD_LIBRARIES_ONLY) + add_subdirectory(man) add_subdirectory(doc) add_subdirectory(doc/dev) if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin) |