From b6f9515fff4f5e47c8514197474294c7168c3ab7 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 11 Nov 2008 11:50:35 +0000 Subject: Fix it svn path=/trunk/KDE/kdelibs/; revision=882740 --- modules/FindBlueZ.cmake | 6 +++--- modules/FindNetworkManager.cmake | 2 +- modules/FindSqlite.cmake | 6 +++--- modules/FindXmms.cmake | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'modules') diff --git a/modules/FindBlueZ.cmake b/modules/FindBlueZ.cmake index f743c3ac..8e1a2fc4 100644 --- a/modules/FindBlueZ.cmake +++ b/modules/FindBlueZ.cmake @@ -18,11 +18,11 @@ endif ( BLUEZ_INCLUDE_DIR AND BLUEZ_LIBRARIES ) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls if( NOT WIN32 ) - INCLUDE(FindPkgConfig) + find_package(PkgConfig) - PKG_CHECK_MODULES(BLUEZ bluez) + pkg_check_modules(BLUEZ bluez) - SET(BLUEZ_DEFINITIONS ${BLUEZ_CFLAGS}) + set(BLUEZ_DEFINITIONS ${BLUEZ_CFLAGS}) endif( NOT WIN32 ) FIND_PATH(BLUEZ_INCLUDE_DIR NAMES bluetooth/bluetooth.h diff --git a/modules/FindNetworkManager.cmake b/modules/FindNetworkManager.cmake index f85dfb5f..cd7b9b89 100644 --- a/modules/FindNetworkManager.cmake +++ b/modules/FindNetworkManager.cmake @@ -22,7 +22,7 @@ ENDIF (NETWORKMANAGER_INCLUDE_DIRS AND NM-UTIL_INCLUDE_DIRS) IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(FindPkgConfig) + find_package((PkgConfig) PKG_SEARCH_MODULE( NETWORKMANAGER NetworkManager ) PKG_SEARCH_MODULE( NM-UTIL libnm-util ) ENDIF (NOT WIN32) diff --git a/modules/FindSqlite.cmake b/modules/FindSqlite.cmake index 29a23612..3dd53351 100644 --- a/modules/FindSqlite.cmake +++ b/modules/FindSqlite.cmake @@ -18,11 +18,11 @@ endif ( SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES ) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls if( NOT WIN32 ) - INCLUDE(FindPkgConfig) + find_package(PkgConfig) - PKG_CHECK_MODULES(SQLITE sqlite3) + pkg_check_modules(SQLITE sqlite3) - SET(SQLITE_DEFINITIONS ${SQLITE_CFLAGS}) + set(SQLITE_DEFINITIONS ${SQLITE_CFLAGS}) endif( NOT WIN32 ) FIND_PATH(SQLITE_INCLUDE_DIR NAMES sqlite3.h diff --git a/modules/FindXmms.cmake b/modules/FindXmms.cmake index a366cfd0..a265f9b3 100644 --- a/modules/FindXmms.cmake +++ b/modules/FindXmms.cmake @@ -19,9 +19,9 @@ else (XMMS_INCLUDE_DIRS AND XMMS_LDFLAGS) IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(FindPkgConfig) + find_package(PkgConfig) - PKG_CHECK_MODULES(XMMS xmms) + pkg_check_modules((XMMS xmms) ENDIF(NOT WIN32) FIND_PATH(XMMS_INCLUDE_DIRS xmmsctrl.h -- cgit v1.2.1