Browse Source

Fix build on Windows.

pull/5/head
Ghislain MARY 9 years ago
parent
commit
a9418408cc
2 changed files with 4 additions and 2 deletions
  1. +2
    -0
      CMakeLists.txt
  2. +2
    -2
      msbcg729/CMakeLists.txt

+ 2
- 0
CMakeLists.txt View File

@ -44,8 +44,10 @@ include(GNUInstallDirs)
if(ENABLE_MSPLUGIN) if(ENABLE_MSPLUGIN)
if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS) if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
include("${EP_ms2_CONFIG_DIR}/Mediastreamer2Config.cmake") include("${EP_ms2_CONFIG_DIR}/Mediastreamer2Config.cmake")
include("${EP_ortp_CONFIG_DIR}/ORTPConfig.cmake")
else() else()
find_package(Mediastreamer2) find_package(Mediastreamer2)
find_package(ORTP)
endif() endif()
if(NOT MEDIASTREAMER2_FOUND) if(NOT MEDIASTREAMER2_FOUND)


+ 2
- 2
msbcg729/CMakeLists.txt View File

@ -30,7 +30,7 @@ include_directories(${MEDIASTREAMER2_INCLUDE_DIRS})
if(ENABLE_STATIC) if(ENABLE_STATIC)
add_library(msbcg729-static STATIC ${BCG729_SOURCE_FILES} ${SOURCE_FILES}) add_library(msbcg729-static STATIC ${BCG729_SOURCE_FILES} ${SOURCE_FILES})
set_target_properties(msbcg729-static PROPERTIES OUTPUT_NAME msbcg729) set_target_properties(msbcg729-static PROPERTIES OUTPUT_NAME msbcg729)
target_link_libraries(msbcg729-static ${MEDIASTREAMER2_LIBRARIES})
target_link_libraries(msbcg729-static ${MEDIASTREAMER2_LIBRARIES} ${ORTP_LIBRARIES})
install(TARGETS msbcg729-static install(TARGETS msbcg729-static
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/mediastreamer/plugins ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/mediastreamer/plugins
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
@ -39,7 +39,7 @@ endif()
if(ENABLE_SHARED) if(ENABLE_SHARED)
add_library(msbcg729 MODULE ${BCG729_SOURCE_FILES} ${SOURCE_FILES}) add_library(msbcg729 MODULE ${BCG729_SOURCE_FILES} ${SOURCE_FILES})
set_target_properties(msbcg729 PROPERTIES SOVERSION 0) set_target_properties(msbcg729 PROPERTIES SOVERSION 0)
target_link_libraries(msbcg729 ${MEDIASTREAMER2_LIBRARIES})
target_link_libraries(msbcg729 ${MEDIASTREAMER2_LIBRARIES} ${ORTP_LIBRARIES})
if(MSVC) if(MSVC)
if(CMAKE_BUILD_TYPE STREQUAL "Debug") if(CMAKE_BUILD_TYPE STREQUAL "Debug")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/libmsbcg729.pdb install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/libmsbcg729.pdb


Loading…
Cancel
Save