CMake: fix build when log4cpp isn't found

 - include for OpenLDAP was not added
 - on FreeBSD, happens to be same as for log4cpp

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 3845e0b..20cc6e4 100644 (file)
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -2,8 +2,11 @@
 # All rights reserved. See file LICENSE for exact terms (2-clause BSD license).
 #
 # Adriaan de Groot <groot@kde.org>
-
-include_directories(${FCGI_INCLUDE_DIRS} ${LOG4CPP_INCLUDE_DIRS} ../3rdparty)
+include_directories(
+  ${FCGI_INCLUDE_DIRS} 
+  ${OpenLDAP_INCLUDE_DIR} 
+  ${LOG4CPP_INCLUDE_DIRS} 
+  ../3rdparty)
 
 set(SWLDAP_SRC
   swldap/connection.cpp

diff --git a/src/crank/CMakeLists.txt b/src/crank/CMakeLists.txt
index 070c359..db9afe1 100644 (file)
--- a/src/crank/CMakeLists.txt
+++ b/src/crank/CMakeLists.txt
@@ -3,7 +3,12 @@
 #
 # Adriaan de Groot <groot@kde.org>
 
-include_directories(${FCGI_INCLUDE_DIRS} ${LOG4CPP_INCLUDE_DIRS} ../common ../3rdparty)
+include_directories(
+  ${FCGI_INCLUDE_DIRS} 
+  ${OpenLDAP_INCLUDE_DIR} 
+  ${LOG4CPP_INCLUDE_DIRS} 
+  ../common 
+  ../3rdparty)
 
 set(CRANK_SRC
   main.cpp

diff --git a/src/pulley/CMakeLists.txt b/src/pulley/CMakeLists.txt
index a4dad4f..505e38d 100644 (file)
--- a/src/pulley/CMakeLists.txt
+++ b/src/pulley/CMakeLists.txt
@@ -6,7 +6,12 @@
 find_package(FLEX REQUIRED)  # Required by pulleyscript
 find_package(SQLite3 REQUIRED)
 
-include_directories(${FCGI_INCLUDE_DIRS} ${LOG4CPP_INCLUDE_DIRS} ../common ../3rdparty)
+include_directories(
+  ${FCGI_INCLUDE_DIRS} 
+  ${OpenLDAP_INCLUDE_DIR} 
+  ${LOG4CPP_INCLUDE_DIRS} 
+  ../common 
+  ../3rdparty)
 
 add_definitions(-DPREFIX="${CMAKE_INSTALL_PREFIX}")
 

diff --git a/src/shaft/CMakeLists.txt b/src/shaft/CMakeLists.txt
index 20ccd8d..ef05695 100644 (file)
--- a/src/shaft/CMakeLists.txt
+++ b/src/shaft/CMakeLists.txt
@@ -7,7 +7,12 @@ find_package(Log4cpp)
 find_package(FCGI REQUIRED)
 find_package(OpenLDAP REQUIRED)
 
-include_directories(${FCGI_INCLUDE_DIRS} ${LOG4CPP_INCLUDE_DIRS} ../common ../3rdparty)
+include_directories(
+  ${FCGI_INCLUDE_DIRS} 
+  ${OpenLDAP_INCLUDE_DIR} 
+  ${LOG4CPP_INCLUDE_DIRS} 
+  ../common 
+  ../3rdparty)
 
 set(SHAFT_SRC
   main.cpp