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

List:       kde-commits
Subject:    [smokekde/KDE/4.10] /: apply a fix from Ben Cooksley to correctly find the QTDEFINES file
From:       Arno Rehn <arno () arnorehn ! de>
Date:       2013-06-10 21:42:15
Message-ID: 20130610214215.C11F3A605A () git ! kde ! org
[Download RAW message or body]

Git commit 5998fe7478dd5e708be9b5e5f1a6e40750f675b1 by Arno Rehn.
Committed on 10/06/2013 at 13:26.
Pushed by arnorehn into branch 'KDE/4.10'.

apply a fix from Ben Cooksley to correctly find the QTDEFINES file

M  +5    -1    CMakeLists.txt

http://commits.kde.org/smokekde/5998fe7478dd5e708be9b5e5f1a6e40750f675b1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8ece6a..a6fc965 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,11 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SMOKE_CMAKE=
_MODULE_DIR})
 include(MacroLibrary)
 include(MacroOptionalAddBindings)
 =

-set(QTDEFINES_FILE ${SMOKE_GEN_SHARED}/qtdefines CACHE FILEPATH "Path to t=
he qtdefines file")
+find_path(QTDEFINES_FILE
+	  qtdefines
+          PATH_SUFFIXES share/smokegen
+	  DOC "Path to the qtdefines file")
+
 if(NOT EXISTS ${QTDEFINES_FILE})
     message(FATAL_ERROR "${QTDEFINES_FILE} doesn't exist. Please adjust th=
e path manually")
 endif(NOT EXISTS ${QTDEFINES_FILE})
[prev in list] [next in list] [prev in thread] [next in thread]