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

List:       kde-commits
Subject:    KDE/kdemultimedia/cmake/modules
From:       Laurent Montel <montel () kde ! org>
Date:       2007-08-22 6:26:46
Message-ID: 1187764006.921579.15101.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 703183 by mlaurent:

Fix find theora


 M  +4 -6      FindTheora.cmake  


--- trunk/KDE/kdemultimedia/cmake/modules/FindTheora.cmake #703182:703183
@@ -1,6 +1,6 @@
 # Option for build or not Theora
 
-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
+# Copyright (c) 2006,2007 Laurent Montel, <montel@kde.org>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
@@ -11,9 +11,6 @@
 	set(Theora_FIND_QUIETLY TRUE)	
 endif(THEORA_INCLUDE_DIR AND THEORA_LIB_LIBRARIES AND THEORA_VORBIS_LIBRARIES AND THEORA_OGG_LIBRARIES)
 
-set(THEORA_LIBRARY)
-set(THEORA_INCLUDE_DIR)
-
 FIND_PATH(THEORA_INCLUDE_DIR theora/theora.h)
 
 FIND_LIBRARY(THEORA_OGG_LIBRARIES NAMES ogg )
@@ -22,9 +19,10 @@
 
 FIND_LIBRARY(THEORA_LIB_LIBRARIES NAMES theora)
 
-if(THEORA_LIB_LIBRARIES AND THEORA_VORBIS_LIBRARIES AND THEORA_OGG_LIBRARIES)
+if(THEORA_LIB_LIBRARIES AND THEORA_VORBIS_LIBRARIES AND THEORA_OGG_LIBRARIES AND THEORA_INCLUDE_DIR)
 	set(THEORA_LIBRARY ${THEORA_LIB_LIBRARIES} ${THEORA_OGG_LIBRARIES} ${THEORA_VORBIS_LIBRARIES})
-endif(THEORA_LIB_LIBRARIES AND THEORA_VORBIS_LIBRARIES AND THEORA_OGG_LIBRARIES)
+	set(THEORA_FOUND TRUE)
+endif(THEORA_LIB_LIBRARIES AND THEORA_VORBIS_LIBRARIES AND THEORA_OGG_LIBRARIES AND THEORA_INCLUDE_DIR)
 
 if (THEORA_FOUND)
   if (NOT Theora_FIND_QUIETLY)
[prev in list] [next in list] [prev in thread] [next in thread]