[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasma-mobile] applications/common: pkg_check_modules needs packageconfig to work properly, which w
From:       Shantanu Tushar <shaan7in () gmail ! com>
Date:       2012-04-24 18:09:29
Message-ID: 20120424180929.D093BA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 9d78a6a4dfddc3744afaa18caf8cc6e15eb9d4a4 by Shantanu Tushar.
Committed on 24/04/2012 at 20:08.
Pushed by shantanu into branch 'master'.

pkg_check_modules needs packageconfig to work properly, which we dont have (yet).
So for now ActiveApp is found if the libs and headers are found.

M  +4    -8    applications/common/FindActiveApp.cmake

http://commits.kde.org/plasma-mobile/9d78a6a4dfddc3744afaa18caf8cc6e15eb9d4a4

diff --git a/applications/common/FindActiveApp.cmake b/applications/common/FindActiveApp.cmake
index 0031aa2..1c06842 100644
--- a/applications/common/FindActiveApp.cmake
+++ b/applications/common/FindActiveApp.cmake
@@ -12,14 +12,6 @@ if (ACTIVEAPP_INCLUDE_DIR AND ACTIVEAPP_LIBRARIES)
   set (ACTIVEAPP_FOUND TRUE)
 
 else (ACTIVEAPP_INCLUDE_DIR AND ACTIVEAPP_LIBRARIES)
-
-  if (NOT WIN32)
-    # use pkg-config to get the values of ACTIVEAPP_INCLUDE_DIRS
-    # and ACTIVEAPP_LIBRARY_DIRS to add as hints to the find commands.
-    include (FindPkgConfig)
-    pkg_check_modules (ACTIVEAPP ActiveApp>=0.1)
-  endif (NOT WIN32)
-
   find_library (ACTIVEAPP_LIBRARIES
     NAMES
     activeapp
@@ -41,6 +33,10 @@ else (ACTIVEAPP_INCLUDE_DIR AND ACTIVEAPP_LIBRARIES)
     ${KDE4_INCLUDE_DIR}
   )
 
+  if(ACTIVEAPP_INCLUDE_DIR AND ACTIVEAPP_LIBRARIES)
+    set(ACTIVEAPP_FOUND TRUE)
+  endif(ACTIVEAPP_INCLUDE_DIR AND ACTIVEAPP_LIBRARIES)
+
   include(FindPackageHandleStandardArgs)
   find_package_handle_standard_args(ACTIVEAPP DEFAULT_MSG ACTIVEAPP_LIBRARIES ACTIVEAPP_INCLUDE_DIR)
 
[prev in list] [next in list] [prev in thread] [next in thread]