# HG changeset patch
# User Myhailo Danylenko <isbear@ukrpost.net>
# Date 1263722688 -7200
# Node ID 6ed6279de87f23df2fcc951b3ff1d471f7a03d88
# Parent  7781b3b05e7584a5ed727f8a3521ea8b4438830e
Fix linker library search path

diff -r 7781b3b05e75 -r 6ed6279de87f CMakeLists.txt
--- a/CMakeLists.txt	Fri Jan 15 11:23:15 2010 +0200
+++ b/CMakeLists.txt	Sun Jan 17 12:04:48 2010 +0200
@@ -17,12 +17,47 @@
 cmake_minimum_required(VERSION 2.6) 
 project(avatar 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)
+pkg_check_modules(PNG REQUIRED libpng12)
+set(AALIB_LIBRARY_DIRS "/usr/lib" CACHE FILEPATH "Path, where AAlib is located")
+set(AALIB_INCLUDE_DIRS "/usr/include" CACHE FILEPATH "Path to AAlib includes")
+set(AALIB_LIBRARIES "-laa" CACHE TEXT "Libraries, necessary to link with AAlib")
+link_directories(${GLIB_LIBRARY_DIRS}
+				 ${GMODULE_LIBRARY_DIRS}
+				 ${LM_LIBRARY_DIRS}
+				 ${PNG_LIBRARY_DIRS}
+				 ${AALIB_LIBRARY_DIRS})
+
 ## Target definitions
 add_library(avatar MODULE avatar.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}
+					${PNG_INCLUDE_DIRS}
+					${AALIB_INCLUDE_DIRS}
+                    ${MCABBER_INCLUDE_DIR})
+target_link_libraries(avatar ${GLIB_LIBRARIES}
+                      ${GMODULE_LIBRARIES}
+					  ${LM_LIBRARIES}
+					  ${PNG_LIBRARIES}
+					  ${AALIB_LIBRARIES})
+include_directories(${avatar_SOURCE_DIR} 
+                    ${avatar_BINARY_DIR})
+
+## Installation
+install(TARGETS avatar DESTINATION lib/mcabber) 
+install(FILES avatar.rc COPYING TODO README DESTINATION share/doc/${CPACK_PACKAGE_NAME})
+install(DIRECTORY help DESTINATION share/mcabber)
+
 ## Packaging information
 set(CPACK_PACKAGE_NAME libmcabber-avatar)
 set(CPACK_PACKAGE_VERSION "0.0.1")
@@ -43,33 +78,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)
-pkg_check_modules(PNG REQUIRED libpng12)
-set(AALIB_INCLUDE_DIRS "/usr/include" CACHE FILEPATH "Path to AAlib includes")
-set(AALIB_LIBRARIES "-laa" CACHE TEXT "Libraries, necessary to link with AAlib")
-
-## Compiler setup
-include_directories(SYSTEM ${GLIB_INCLUDE_DIRS} 
-                    ${GMODULE_INCLUDE_DIRS} 
-                    ${LM_INCLUDE_DIRS}
-					${PNG_INCLUDE_DIRS}
-					${AALIB_INCLUDE_DIRS}
-                    ${MCABBER_INCLUDE_DIR})
-target_link_libraries(avatar ${GLIB_LIBRARIES} 
-                      ${GMODULE_LIBRARIES}
-					  ${LM_LIBRARIES}
-					  ${PNG_LIBRARIES}
-					  ${AALIB_LIBRARIES})
-include_directories(${avatar_SOURCE_DIR} 
-                    ${avatar_BINARY_DIR})
-
-## Installation
-install(TARGETS avatar DESTINATION lib/mcabber) 
-install(FILES avatar.rc COPYING TODO README DESTINATION share/doc/${CPACK_PACKAGE_NAME})
-install(DIRECTORY help DESTINATION share/mcabber)
-
 ## The End ## vim: se ts=4: ##