From e93fb38ba761baeb14fa67e7b02939582ae85697 Mon Sep 17 00:00:00 2001 From: Lubos Dolezel Date: Thu, 4 Jun 2015 09:19:24 +0200 Subject: Fix CMakeLists.txt to always include all required dependencies --- CMakeLists.txt | 36 +++--------------------------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a538bda..7e4e3ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,15 +24,9 @@ find_package(BISON REQUIRED) find_package(FLEX REQUIRED) find_package(Boost REQUIRED COMPONENTS regex) -find_package(Commoncpp) - -if (COMMONCPP_FOUND) - message(STATUS "commoncpp OK") - - include_directories(${COMMONCPP_INCLUDE_DIR}) -else (COMMONCPP_FOUND) - message(FATAL_ERROR "commoncpp not found!") -endif (COMMONCPP_FOUND) +find_package(Commoncpp REQUIRED) +find_package(Ccrtp REQUIRED) +find_package(Ucommon REQUIRED) include_directories(${LIBXML2_INCLUDE_DIR} ${QT_QT3SUPPORT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_INCLUDE_DIR}) @@ -59,30 +53,6 @@ if (WITH_ZRTP) else (ZRTPCPP_FOUND) message(FATAL_ERROR "libzrtpcpp not found!") endif (ZRTPCPP_FOUND) - - ##### - - find_package(Ccrtp) - - if (CCRTP_FOUND) - message(STATUS "ccrtp OK") - - include_directories(${CCRTP_INCLUDE_DIR}) - else (CCRTP_FOUND) - message(FATAL_ERROR "ccrtp not found!") - endif (CCRTP_FOUND) - - ##### - - find_package(Ucommon) - - if (UCOMMON_FOUND) - message(STATUS "ucommon OK") - - include_directories(${UCOMMON_INCLUDE_DIR}) - else (UCOMMON_FOUND) - message(FATAL_ERROR "ucommon not found!") - endif (UCOMMON_FOUND) endif (WITH_ZRTP) if (WITH_SPEEX) -- cgit v1.2.3