[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/soc-kopete-jingle
From: Detlev Casanova <detlev.casanova () gmail ! com>
Date: 2008-10-18 22:57:52
Message-ID: 1224370672.454530.1704.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 873171 by casanova:
* Really check for oRTP 0.13
M +1 -1 CMakeLists.txt
M +22 -18 cmake/modules/FindLiboRTP.cmake
--- branches/work/soc-kopete-jingle/CMakeLists.txt #873170:873171
@@ -29,6 +29,7 @@
endif (WIN32)
find_package(KdepimLibs REQUIRED)
+find_package(LiboRTP REQUIRED)
find_package(QCA2)
find_package(IW)
find_package(JPEG)
@@ -37,7 +38,6 @@
find_package(IDN)
find_package(Plasma)
find_package(LibVNCServer)
-find_package(LiboRTP)
macro_optional_find_package(DNSSD)
macro_optional_find_package(SLP)
--- branches/work/soc-kopete-jingle/cmake/modules/FindLiboRTP.cmake #873170:873171
@@ -5,26 +5,30 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#INCLUDE(MacroEnsureVersion)
-MESSAGE( "Looking for LiboRTP" )
-INCLUDE(FindPackageHandleStandardArgs)
+INCLUDE( FindPackageHandleStandardArgs )
-FIND_PATH(LIBORTP_INCLUDE_DIR ortp/ortp.h)
+FIND_PATH( LIBORTP_INCLUDE_DIR ortp/ortp.h ${KDE4_INCLUDE_DIR} )
-FIND_LIBRARY(LIBORTP_LIBRARY NAMES ortp)
+FIND_LIBRARY( LIBORTP_LIBRARY NAMES ortp )
+SET( LIBORTP_FOUND FALSE )
+
IF( LIBORTP_INCLUDE_DIR AND LIBORTP_LIBRARY )
-
- EXECUTE_PROCESS(COMMAND gcc -o ortpversion -lortp -L${LIBORTP_INCLUDE_DIR} \
${CMAKE_SOURCE_DIR}/cmake/modules/ortpversion.c RESULT_VARIABLE \
result)
- if (NOT result)
- EXECUTE_PROCESS(COMMAND ./ortpversion 0 13 RESULT_VARIABLE result)
- endif(NOT result)
- if (NOT result)
-# Version OK
- SET( LIBORTP_FOUND TRUE)
- MESSAGE( STATUS "Found libortp: ${LIBORTP_LIBRARY}")
- elseif(result)
-# Version non OK
- MESSAGE( STATUS "You need ortp version 0.13 minimum !")
- endif(NOT result)
+ EXECUTE_PROCESS( COMMAND gcc -o ortpversion -lortp -L${LIBORTP_INCLUDE_DIR} \
${CMAKE_SOURCE_DIR}/cmake/modules/ortpversion.c OUTPUT_QUIET ERROR_QUIET \
RESULT_VARIABLE compileErr ) + if ( NOT compileErr )
+ EXECUTE_PROCESS(COMMAND ./ortpversion 0 13 RESULT_VARIABLE resultErr )
+ if ( NOT resultErr )
+# Version OK
+ SET( LIBORTP_FOUND TRUE )
+ MESSAGE( STATUS "Found libortp: ${LIBORTP_LIBRARY}" )
+ endif( NOT resultErr )
+ endif( NOT compileErr )
ENDIF( LIBORTP_INCLUDE_DIR AND LIBORTP_LIBRARY )
+
+IF( resultErr OR compileErr )
+ if( LiboRTP_FIND_REQUIRED )
+ message( FATAL_ERROR "You need ortp version 0.13 minimum.\nPlease build and \
install it first." ) + else ( LiboRTP_FIND_REQUIRED )
+ message( "LiboRTP not found on your system !" )
+ endif ( LiboRTP_FIND_REQUIRED )
+endif( resultErr OR compileErr )
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic