From 773726ff724b4abddc3465865a6f5eb2162956fd Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 5 Mar 2015 18:04:47 +0100 Subject: [PATCH] Fix build with CMake (MS2 -> Mediastreamer2). --- CMakeLists.txt | 5 +++-- coreapi/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5b0d30a8..308bfb12d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,13 +57,14 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/share/cmake/Modules") include(CheckIncludeFile) include(CheckSymbolExists) +include(CMakePushCheckState) if(MSVC) list(APPEND CMAKE_REQUIRED_INCLUDES "${CMAKE_PREFIX_PATH}/include/MSVC") endif() find_package(BelleSIP REQUIRED) -find_package(MS2 REQUIRED) +find_package(Mediastreamer2 REQUIRED) find_package(XML2 REQUIRED) if(ENABLE_UNIT_TESTS) find_package(CUnit) @@ -119,7 +120,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/coreapi/ ${BELLESIP_INCLUDE_DIRS} - ${MS2_INCLUDE_DIRS} + ${MEDIASTREAMER2_INCLUDE_DIRS} ${XML2_INCLUDE_DIRS} ) if(SQLITE3_FOUND) diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt index a82c18196..b21afc87d 100644 --- a/coreapi/CMakeLists.txt +++ b/coreapi/CMakeLists.txt @@ -120,7 +120,7 @@ set(LIBS ${LIBGCC} ${LIBMINGWEX} ${BELLESIP_LIBRARIES} - ${MS2_LIBRARIES} + ${MEDIASTREAMER2_LIBRARIES} ${XML2_LIBRARIES} ) if(SQLITE3_FOUND)