upmerge 14035452 5.1 -> 5.5

8f105640 · Bjorn Munch · daa380b9 · 6aaf1579 · 8f105640
Commit 8f105640 authored Jul 19, 2012 by Bjorn Munch
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

CMakeLists.txt CMakeLists.txt +3 -0

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -324,6 +324,9 @@ IF(NOT WITHOUT_SERVER)
  IF(UNIX)
    ADD_SUBDIRECTORY(man)
  ENDIF()
+  IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
+    ADD_SUBDIRECTORY(internal)
+  ENDIF()
 ENDIF()

 INCLUDE(cmake/abi_check.cmake)