diff -r 320e4393785a -r 6a47079725da CMakeLists.txt --- a/CMakeLists.txt Tue Nov 10 19:36:54 2009 +0200 +++ b/CMakeLists.txt Fri Jan 15 12:25:04 2010 +0200 @@ -21,8 +21,7 @@ add_library(yaubil MODULE yaubil.c) ## User settable options -set(MCABBER_INCLUDE_DIR "${yaubil_SOURCE_DIR}/../include" - CACHE FILEPATH "Path to mcabber headers") +set(MCABBER_INCLUDE_DIR "/usr/include" CACHE FILEPATH "Path to mcabber headers") ## Packaging information set(CPACK_PACKAGE_NAME libmcabber-yaubil) @@ -48,18 +47,17 @@ find_package(PkgConfig REQUIRED) pkg_check_modules(GLIB REQUIRED glib-2.0) pkg_check_modules(GMODULE REQUIRED gmodule-2.0) -#pkg_check_modules(LM REQUIRED loudmouth-1.0) ## Compiler setup include_directories(SYSTEM ${GLIB_INCLUDE_DIRS} ${GMODULE_INCLUDE_DIRS} - ${LM_INCLUDE_DIRS}) + ${LM_INCLUDE_DIRS} + ${MCABBER_INCLUDE_DIR}) target_link_libraries(yaubil ${GLIB_LIBRARIES} ${GMODULE_LIBRARIES} ${LM_LIBRARIES}) include_directories(${yaubil_SOURCE_DIR} - ${yaubil_BINARY_DIR} - ${MCABBER_INCLUDE_DIR}) + ${yaubil_BINARY_DIR}) ## Installation install(TARGETS yaubil DESTINATION lib/mcabber)