Changeset 5986 for branches/newosd

Timestamp:

01/04/08 01:26:33 (11 months ago)

Author:

eugene

Message:

Now, that libaosd-text is linked to libaosd, there is no need to search and include both.

Files:

• branches/newosd/CMakeLists.txt (modified) (2 diffs)

branches/newosd/CMakeLists.txt

@@ -12 +12 @@
 mark_as_advanced(INSTALL_LIB_DIR)
 
-# Holds all libraries we should link to 
-set(LIBRARIES)
-
-# use pkg-config to find libaosd
-include(UsePkgConfig)
-
-pkgconfig(libaosd AOSD_INCLUDE_DIR AOSD_LINK_DIR AOSD_LINK_FLAGS AOSD_CFLAGS)
-
-if (AOSD_LINK_FLAGS)
-    message(STATUS "Found aosd library dir: ${AOSD_LINK_DIR}")
-    set(LIBRARIES ${LIBRARIES} ${AOSD_LINK_FLAGS})
-    include_directories(${AOSD_INCLUDE_DIR})
-    add_definitions(${AOSD_CFLAGS})
-else (AOSD_LINK_FLAGS)
-    message(FATAL_ERROR "libaosd wasn't found...")
-endif (AOSD_LINK_FLAGS)
-
 # Licq headers (see cmake --help-command find_path
-# for the reason we call find_path twice)
+# for the reason why we call find_path twice here)
 find_path(LICQ_INCLUDE_DIR NAMES licq_icqd.h
           PATHS ${CMAKE_SOURCE_DIR}/../../include
@@ -44 +27 @@
 include_directories(${LICQ_INCLUDE_DIR})
 
+# Holds all libraries we should link to 
+set(LIBRARIES)
+
+# use pkg-config to find libaosd stuff
+include(UsePkgConfig)
+
+pkgconfig(libaosd-text AOSD_INCLUDE_DIR AOSD_LINK_DIR AOSD_LINK_FLAGS AOSD_CFLAGS)
+
+if (AOSD_LINK_FLAGS)
+    message(STATUS "Found aosd-text library dir: ${AOSD_LINK_DIR}")
+    set(LIBRARIES ${LIBRARIES} ${AOSD_LINK_FLAGS})
+    include_directories(${AOSD_INCLUDE_DIR})
+    add_definitions(${AOSD_CFLAGS})
+else (AOSD_LINK_FLAGS)
+    message(FATAL_ERROR "libaosd-text wasn't found...")
+endif (AOSD_LINK_FLAGS)
+
 # To find config.h
 include_directories(${CMAKE_BINARY_DIR})