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

List:       kde-commits
Subject:    [kdenlive] cmake/modules: cmake: prefix the pkg-config vars
From:       Pino Toscano <pino () kde ! org>
Date:       2014-10-11 21:34:26
Message-ID: E1Xd4J0-0001rW-It () scm ! kde ! org
[Download RAW message or body]

Git commit daef9781168d5632a104e1d15f18ca4d6ac34f8b by Pino Toscano.
Committed on 11/10/2014 at 21:33.
Pushed by pino into branch 'master'.

cmake: prefix the pkg-config vars

This avoids the conflict between variables set by the pkg-config cmake
module, and those set by find_library/find_file.

M  +3    -3    cmake/modules/FindQJSON.cmake

http://commits.kde.org/kdenlive/daef9781168d5632a104e1d15f18ca4d6ac34f8b

diff --git a/cmake/modules/FindQJSON.cmake b/cmake/modules/FindQJSON.cmake
index cf76dd3..404d89e 100644
--- a/cmake/modules/FindQJSON.cmake
+++ b/cmake/modules/FindQJSON.cmake
@@ -23,14 +23,14 @@ else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
     # use pkg-config to get the values of QJSON_INCLUDE_DIRS
     # and QJSON_LIBRARY_DIRS to add as hints to the find commands.
     include (FindPkgConfig)
-    pkg_check_modules (QJSON REQUIRED QJson>=0.5)
+    pkg_check_modules (PC_QJSON REQUIRED QJson>=0.5)
   endif (NOT WIN32)
 
   find_library (QJSON_LIBRARIES
     NAMES
     qjson
     PATHS
-    ${QJSON_LIBRARY_DIRS}
+    ${PC_QJSON_LIBRARY_DIRS}
     ${LIB_INSTALL_DIR}
     ${KDE4_LIB_DIR}
   )
@@ -39,7 +39,7 @@ else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
     NAMES
     qjson/parser.h
     PATHS
-    ${QJSON_INCLUDE_DIRS}
+    ${PC_QJSON_INCLUDE_DIRS}
     ${INCLUDE_INSTALL_DIR}
     ${KDE4_INCLUDE_DIR}
   )
[prev in list] [next in list] [prev in thread] [next in thread]