[dss-commits] r8732 - dss/trunk

[dss-commits at forum.digitalstrom.org]

Author: astricker
Date: 2009-09-04 12:23:44 +0200 (Fri, 04 Sep 2009)
New Revision: 8732

Modified:
   dss/trunk/CMakeLists.txt
Log:
Added a check for libical headers and library

 * Better checks simplify debugging build problems (refs #115)

Modified: dss/trunk/CMakeLists.txt
===================================================================
--- dss/trunk/CMakeLists.txt	2009-09-04 10:23:42 UTC (rev 8731)
+++ dss/trunk/CMakeLists.txt	2009-09-04 10:23:44 UTC (rev 8732)
@@ -46,14 +46,6 @@
 # header tests
 INCLUDE(CheckIncludeFiles)
 
-# check for SpiderMonkey API header
-SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -DXP_UNIX)
-CHECK_INCLUDE_FILES(mozjs/jsapi.h HAVE_MOZJS_JSAPI_H)
-CHECK_INCLUDE_FILES(js/jsapi.h HAVE_JS_JSAPI_H)
-
-CHECK_INCLUDE_FILES(libical/ical.h HAVE_LIBICAL_ICAL_H)
-CHECK_INCLUDE_FILES(ical.h HAVE_ICAL_H)
-
 CHECK_INCLUDE_FILES(dns_sd.h HAVE_DNS_SD)
 CHECK_INCLUDE_FILES(avahi-client/publish.h HAVE_AVAHI)
 
@@ -71,14 +63,17 @@
 ELSE(${HAVE_DNS_SD} MATCHES 1)
 ENDIF(${HAVE_DNS_SD} MATCHES 1)
 
-
+# check for SpiderMonkey API header
+SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -DXP_UNIX)
+CHECK_INCLUDE_FILES(mozjs/jsapi.h HAVE_MOZJS_JSAPI_H)
+CHECK_INCLUDE_FILES(js/jsapi.h HAVE_JS_JSAPI_H)
 # check for SpiderMonkey Library
 FIND_LIBRARY(MOZJS mozjs)
 IF(${MOZJS} MATCHES "MOZJS-NOTFOUND")
   FIND_LIBRARY(MOZJS js)
 ENDIF(${MOZJS} MATCHES "MOZJS-NOTFOUND")
 
-# check for gsoap library
+# check for gsoap headers and library
 CHECK_INCLUDE_FILES(stdsoap2.h HAVE_STDSOAP2_H)
 IF(NOT HAVE_STDSOAP2_H)
   MESSAGE(FATAL_ERROR "gsoap library is required: stdsoap2.h header not found")
@@ -88,6 +83,17 @@
   MESSAGE(FATAL_ERROR "gsoap library is required: library gsoap++ not found")
 ENDIF(${GSOAPPP} MATCHES "GSOAPPP-NOTFOUND")
 
+# check for libical headers and library
+CHECK_INCLUDE_FILES(libical/ical.h HAVE_LIBICAL_ICAL_H)
+CHECK_INCLUDE_FILES(ical.h HAVE_ICAL_H)
+IF(NOT HAVE_ICAL_H AND NOT HAVE_LIBICAL_ICAL_H)
+  MESSAGE(FATAL_ERROR "libical library is required: ical.h not found")
+ENDIF(NOT HAVE_ICAL_H AND NOT HAVE_LIBICAL_ICAL_H)
+FIND_LIBRARY(LIBICAL ical)
+IF(${LIBICAL} MATCHES "LIBICAL-NOTFOUND")
+  MESSAGE(FATAL_ERROR "libical libical is required: library libical not found")
+ENDIF(${LIBICAL} MATCHES "LIBICAL-NOTFOUND")
+
 # generate config.h header file
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/config.h)
@@ -104,7 +110,7 @@
 
 
 SET(REQUIRED_LIBS ${REQUIRED_LIBS} ${GSOAPPP} PocoXML ${MOZJS} ${DNS_SD_LIB}
-	${BOOST_TEST_LIB} dl ical)
+	${BOOST_TEST_LIB} dl ${LIBICAL})
 
 SET(BOOST_TEST_LIB)
 SET(TEST_LIB)