Changeset 6203

Timestamp:

05/25/08 10:01:31 (6 months ago)

Author:

eugene

Message:

Upgraded the build-system to cmake 2.6.0

Files:

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

branches/newosd/CMakeLists.txt

@@ -1 +1 @@
 project(newosd)
-cmake_minimum_required(VERSION 2.4.2)
+cmake_minimum_required(VERSION 2.6.0)
 
 # Plugin version
@@ -9 +9 @@
 # Install dirs
 set(INSTALL_LIB_DIR lib CACHE PATH
-  "Directory to install the plugin to. A relative path is relative to CMAKE_INSTALL_PREFIX.")
+    "Directory to install the plugin to. A relative path is relative to CMAKE_INSTALL_PREFIX.")
 mark_as_advanced(INSTALL_LIB_DIR)
 
@@ -21 +21 @@
 
 if (NOT LICQ_INCLUDE_DIR)
-  message(FATAL_ERROR "Licq header files not found. Please specify the location with -DLICQ_INCLUDE_DIR")
+    message(FATAL_ERROR "Licq header files not found. Please specify the location with -DLICQ_INCLUDE_DIR")
 endif (NOT LICQ_INCLUDE_DIR)
 
@@ -31 +31 @@
 
 # use pkg-config to find libaosd stuff
-include(UsePkgConfig)
+include(FindPkgConfig)
 
-pkgconfig(libaosd-text AOSD_INCLUDE_DIR AOSD_LINK_DIR AOSD_LINK_FLAGS AOSD_CFLAGS)
+if (NOT PKG_CONFIG_FOUND)
+    message(FATAL_ERROR "pkg-config could not be found on your system, unable to continue.")
+endif (NOT PKG_CONFIG_FOUND)
 
-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})
+pkg_search_module(AOSD REQUIRED libaosd-text)
+
+if (AOSD_FOUND)
+    set(LIBRARIES ${LIBRARIES} ${AOSD_LIBRARIES})
+    include_directories(${AOSD_INCLUDE_DIRS})
     add_definitions(${AOSD_CFLAGS})
-else (AOSD_LINK_FLAGS)
+else (AOSD_FOUND)
     message(FATAL_ERROR "libaosd-text wasn't found...")
-endif (AOSD_LINK_FLAGS)
+endif (AOSD_FOUND)
 
 # To find config.h