Browse Source

Fix build with CMake which was broken with last commit.

pull/1/head
Ghislain MARY 11 years ago
parent
commit
6ca907ef96
2 changed files with 10 additions and 10 deletions
  1. +3
    -3
      CMakeLists.txt
  2. +7
    -7
      src/CMakeLists.txt

+ 3
- 3
CMakeLists.txt View File

@ -34,9 +34,9 @@ set(PACKAGE_URL "")
set(VERSION "${PACKAGE_VERSION}")
option(ENABLE_TESTS "Enable compilation of the tests." No)
option(ENABLE_MSPLUGIN "Enable compilation of the mediastreamer2 plugin." Yes)
option(ENABLE_STATIC "Build static library (default is shared library)." OFF)
option(ENABLE_TESTS "Enable compilation of the tests." NO)
option(ENABLE_MSPLUGIN "Enable compilation of the mediastreamer2 plugin." YES)
option(ENABLE_STATIC "Build static library (default is shared library)." NO)
if(ENABLE_MSPLUGIN)
find_package(Mediastreamer2)


+ 7
- 7
src/CMakeLists.txt View File

@ -20,7 +20,7 @@
#
############################################################################
set(SOURCE_FILES
set(BCG729_SOURCE_FILES
adaptativeCodebookSearch.c
codebooks.c
computeAdaptativeCodebookGain.c
@ -47,9 +47,9 @@ set(SOURCE_FILES
)
if (ENABLE_STATIC)
add_library(bcg729 STATIC ${SOURCE_FILES})
add_library(bcg729 STATIC ${BCG729_SOURCE_FILES})
else()
add_library(bcg729 SHARED ${SOURCE_FILES})
add_library(bcg729 SHARED ${BCG729_SOURCE_FILES})
set_target_properties(bcg729 PROPERTIES VERSION 0)
if(MSVC)
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
@ -69,8 +69,8 @@ install(TARGETS bcg729 EXPORT Bcg729Targets
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
set(ABS_SOURCE_FILES )
foreach(elem ${SOURCE_FILES})
list(APPEND ABS_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/${elem}")
set(ABS_BCG729_SOURCE_FILES )
foreach(elem ${BCG729_SOURCE_FILES})
list(APPEND ABS_BCG729_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/${elem}")
endforeach()
set(SOURCE_FILES ${ABS_SOURCE_FILES} PARENT_SCOPE)
set(BCG729_SOURCE_FILES ${ABS_BCG729_SOURCE_FILES} PARENT_SCOPE)

Loading…
Cancel
Save