Fix iconv include directory
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Wed, 11 May 2011 11:34:48 +0000 (13:34 +0200)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Wed, 11 May 2011 11:34:48 +0000 (13:34 +0200)
CMakeLists.txt
libi2ncommon.pc.in

index c0540cb..989055a 100644 (file)
@@ -124,6 +124,10 @@ set(BOOST_LDADD "-l${BOOST_LDADD}")
 string(REGEX REPLACE ";" " -I" BOOST_CFLAGS "${Boost_INCLUDE_DIRS}")
 set(BOOST_CFLAGS "-I${BOOST_CFLAGS}")
 
+# construct ${ICONV_CFLAGS} from ${ICONV_INCLUDE_DIRS}
+string(REGEX REPLACE ";" " -I" ICONV_CFLAGS "${ICONV_INCLUDE_DIRS}")
+set(ICONV_CFLAGS "-I${ICONV_CFLAGS}")
+
 configure_file(${CMAKE_SOURCE_DIR}/libi2ncommon.pc.in ${CMAKE_BINARY_DIR}/libi2ncommon.pc @ONLY)
 configure_file(${CMAKE_SOURCE_DIR}/libi2ncommon_config.pc.in ${CMAKE_BINARY_DIR}/libi2ncommon_config.pc @ONLY)
 configure_file(${CMAKE_SOURCE_DIR}/libi2ncommon_xml.pc.in ${CMAKE_BINARY_DIR}/libi2ncommon_xml.pc @ONLY)
index 8a4d578..c992a88 100644 (file)
@@ -8,4 +8,4 @@ Description: library with functions common in Intra2net programs
 Requires: libi2ncommon_utils
 Version: @VERSION@
 Libs: -L${libdir} -li2ncommon -li2ncommon_utils @BOOST_LDADD@
-Cflags: -I${includedir} @BOOST_CFLAGS@
+Cflags: -I${includedir} @BOOST_CFLAGS@ @ICONV_CFLAGS@