--- a/CMakeLists.txt	Fri Jan 15 11:25:03 2010 +0200
+++ b/CMakeLists.txt	Sun Jan 17 12:10:37 2010 +0200
@@ -17,12 +17,38 @@
 cmake_minimum_required(VERSION 2.6) 
 project(disco C) 
 
+## User settable options
+set(MCABBER_INCLUDE_DIR "/usr/include" CACHE FILEPATH "Path to mcabber headers") 
+ 
+## Check for build dependencies
+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) 
+link_directories(${GLIB_LIBRARY_DIRS}
+				 ${GMODULE_LIBRARY_DIRS}
+				 ${LM_LIBRARY_DIRS})
+
 ## Target definitions
 add_library(disco MODULE disco.c)
 
-## User settable options
-set(MCABBER_INCLUDE_DIR "/usr/include" CACHE FILEPATH "Path to mcabber headers") 
- 
+## Compiler setup
+include_directories(SYSTEM ${GLIB_INCLUDE_DIRS} 
+                    ${GMODULE_INCLUDE_DIRS} 
+                    ${LM_INCLUDE_DIRS}
+					${MCABBER_INCLUDE_DIR}) 
+target_link_libraries(disco ${GLIB_LIBRARIES} 
+                      ${GMODULE_LIBRARIES}
+					  ${LM_LIBRARIES})
+include_directories(${disco_SOURCE_DIR} 
+                    ${disco_BINARY_DIR}) 
+
+## Installation
+install(TARGETS disco DESTINATION lib/mcabber) 
+install(FILES disco.rc COPYING TODO README DESTINATION share/doc/${CPACK_PACKAGE_NAME})
+install(FILES disco.h DESTINATION include/mcabber)
+install(DIRECTORY help DESTINATION share/mcabber)
+
 ## Packaging information
 set(CPACK_PACKAGE_NAME libmcabber-disco)
 set(CPACK_PACKAGE_VERSION "0.0.1")
@@ -43,27 +69,4 @@
 set(CPACK_SOURCE_IGNORE_FILES "/\\\\..*;\\\\.swp;~$;/build/;\\\\.tar\\\\.;\\\\.deb;\\\\.so")
 include(CPack)
 
-## Check for build dependencies
-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}
-					${MCABBER_INCLUDE_DIR}) 
-target_link_libraries(disco ${GLIB_LIBRARIES} 
-                      ${GMODULE_LIBRARIES}
-					  ${LM_LIBRARIES})
-include_directories(${disco_SOURCE_DIR} 
-                    ${disco_BINARY_DIR}) 
-
-## Installation
-install(TARGETS disco DESTINATION lib/mcabber) 
-install(FILES disco.rc COPYING TODO README DESTINATION share/doc/${CPACK_PACKAGE_NAME})
-install(FILES disco.h DESTINATION include/mcabber)
-install(DIRECTORY help DESTINATION share/mcabber)
-
 ## The End ## vim: se ts=4: ##