[dss-commits] r8731 - dss/trunk

[dss-commits at forum.digitalstrom.org]

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

Modified:
   dss/trunk/CMakeLists.txt
Log:
Added CMake check for gsoap headers and library

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

Modified: dss/trunk/CMakeLists.txt
===================================================================
--- dss/trunk/CMakeLists.txt	2009-09-03 10:14:32 UTC (rev 8730)
+++ dss/trunk/CMakeLists.txt	2009-09-04 10:23:42 UTC (rev 8731)
@@ -78,10 +78,16 @@
   FIND_LIBRARY(MOZJS js)
 ENDIF(${MOZJS} MATCHES "MOZJS-NOTFOUND")
 
-# set default data directory
+# check for gsoap 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")
+ENDIF(NOT HAVE_STDSOAP2_H)
+FIND_LIBRARY(GSOAPPP "gsoap++")
+IF(${GSOAPPP} MATCHES "GSOAPPP-NOTFOUND")
+  MESSAGE(FATAL_ERROR "gsoap library is required: library gsoap++ not found")
+ENDIF(${GSOAPPP} MATCHES "GSOAPPP-NOTFOUND")
 
-
-
 # generate config.h header file
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/config.h)
@@ -97,7 +103,7 @@
 LINK_DIRECTORIES(${DSS_BINARY_DIR}/core ${DSS_BINARY_DIR}/unix ${DSS_BINARY_DIR}/tests)
 
 
-SET(REQUIRED_LIBS ${REQUIRED_LIBS} gsoap++ PocoXML ${MOZJS} ${DNS_SD_LIB}
+SET(REQUIRED_LIBS ${REQUIRED_LIBS} ${GSOAPPP} PocoXML ${MOZJS} ${DNS_SD_LIB}
 	${BOOST_TEST_LIB} dl ical)
 
 SET(BOOST_TEST_LIB)