changeset 1140:946fad6c96a1

merge
author Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
date Tue, 24 Mar 2009 18:22:47 +0100
parents d82cc6e5bb65 (diff) 4c8bb03e4fbc (current diff)
children 49421d3ac5a7
files
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Tue Mar 24 15:24:59 2009 +0100
+++ b/CMakeLists.txt	Tue Mar 24 18:22:47 2009 +0100
@@ -15,10 +15,12 @@
 else(NOT PKG_CONFIG_FOUND)
     pkg_search_module(LIBCONFIGPP libconfig++)
     if(NOT LIBCONFIGPP_FOUND)
-        message(FATAL_ERROR "libconfig++ not found")
+        set(LIBCONFIG_CXXFLAGS "" CACHE STRING "libconfig++ compiler flags")
+        set(LIBCONFIG_LDFLAGS "" CACHE STRING "libconfig++ linker flags")
+    else(NOT LIBCONFIGPP_FOUND)
+        set(LIBCONFIG_CXXFLAGS ${LIBCONFIGPP_CFLAGS} CACHE STRING "libconfig++ compiler flags")
+        set(LIBCONFIG_LDFLAGS ${LIBCONFIGPP_LDFLAGS} CACHE STRING "libconfig++ linker flags")
     endif(NOT LIBCONFIGPP_FOUND)
-    set(LIBCONFIG_CXXFLAGS ${LIBCONFIGPP_CFLAGS} CACHE STRING "libconfig++ compiler flags")
-    set(LIBCONFIG_LDFLAGS ${LIBCONFIGPP_LDFLAGS} CACHE STRING "libconfig++ linker flags")
 endif(NOT PKG_CONFIG_FOUND)