Commit 28fdc425 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Fix build with CMake.

parent acc69ee7
...@@ -46,7 +46,6 @@ endif() ...@@ -46,7 +46,6 @@ endif()
list(APPEND CMAKE_MODULE_PATH ${CMAKE_PREFIX_PATH}/share/cmake/Modules) list(APPEND CMAKE_MODULE_PATH ${CMAKE_PREFIX_PATH}/share/cmake/Modules)
message("CMAKE_MODULE_PATH: ${CMAKE_MODULE_PATH}")
include(CheckIncludeFile) include(CheckIncludeFile)
check_include_file("dlfcn.h" HAVE_DLFCN_H) check_include_file("dlfcn.h" HAVE_DLFCN_H)
...@@ -75,7 +74,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY ...@@ -75,7 +74,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY
include_directories( include_directories(
${MS2_INCLUDE_DIR}
include include
src src
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
......
...@@ -25,6 +25,8 @@ set(SOURCE_FILES ...@@ -25,6 +25,8 @@ set(SOURCE_FILES
bcg729_enc.c bcg729_enc.c
) )
include_directories(${MS2_INCLUDE_DIRS})
add_library(msbcg729 SHARED ${BCG729_SOURCE_FILES} ${SOURCE_FILES}) add_library(msbcg729 SHARED ${BCG729_SOURCE_FILES} ${SOURCE_FILES})
set_target_properties(msbcg729 PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 0) set_target_properties(msbcg729 PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 0)
if(MSVC) if(MSVC)
...@@ -36,7 +38,7 @@ if(MSVC) ...@@ -36,7 +38,7 @@ if(MSVC)
endif() endif()
set_target_properties(msbcg729 PROPERTIES PREFIX "lib") set_target_properties(msbcg729 PROPERTIES PREFIX "lib")
endif() endif()
target_link_libraries(msbcg729 ${BCG729_LIBS}) target_link_libraries(msbcg729 ${MS2_LIBRARIES} ${ORTP_LIBRARIES})
install(TARGETS msbcg729 install(TARGETS msbcg729
RUNTIME DESTINATION lib/mediastreamer/plugins RUNTIME DESTINATION lib/mediastreamer/plugins
......
...@@ -20,11 +20,6 @@ ...@@ -20,11 +20,6 @@
# #
############################################################################ ############################################################################
set(BCG729_LIBS
${MS2_LIBRARIES}
${ORTP_LIBRARIES}
)
set(BCG729_SOURCE_FILES set(BCG729_SOURCE_FILES
adaptativeCodebookSearch.c adaptativeCodebookSearch.c
codebooks.c codebooks.c
...@@ -62,7 +57,6 @@ if(MSVC) ...@@ -62,7 +57,6 @@ if(MSVC)
endif() endif()
set_target_properties(bcg729 PROPERTIES PREFIX "lib") set_target_properties(bcg729 PROPERTIES PREFIX "lib")
endif() endif()
target_link_libraries(bcg729 ${BCG729_LIBS})
install(TARGETS bcg729 install(TARGETS bcg729
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment