Browse Source

Merge branch 'pr/github' into 'master'

Pr/github

See merge request BC/public/bcg729!4
keep-around/1e20d17425e24c17624b7c9afeb680286b44da62
johan 7 years ago
parent
commit
1e20d17425
2 changed files with 19 additions and 0 deletions
  1. +16
    -0
      CMakeLists.txt
  2. +3
    -0
      autogen.sh

+ 16
- 0
CMakeLists.txt View File

@ -66,6 +66,9 @@ else()
if (NOT IOS) if (NOT IOS)
add_definitions("-Werror") add_definitions("-Werror")
endif() endif()
if(NOT ENABLE_TESTS) # test access inner functions so maintain visibility if we want to run tests
add_definitions("-fvisibility=hidden")
endif()
endif() endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
@ -91,6 +94,19 @@ configure_file(Bcg729Config.cmake.in
@ONLY @ONLY
) )
set(prefix "${CMAKE_INSTALL_PREFIX}")
set(exec_prefix "\${prefix}")
set(includedir "\${prefix}/include")
set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
configure_file(libbcg729.pc.in
"${CMAKE_CURRENT_BINARY_DIR}/libbcg729.pc"
@ONLY
)
install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/libbcg729.pc"
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
)
set(CONFIG_PACKAGE_LOCATION "${CMAKE_INSTALL_DATADIR}/Bcg729/cmake") set(CONFIG_PACKAGE_LOCATION "${CMAKE_INSTALL_DATADIR}/Bcg729/cmake")
install(EXPORT Bcg729Targets install(EXPORT Bcg729Targets
FILE Bcg729Targets.cmake FILE Bcg729Targets.cmake


+ 3
- 0
autogen.sh View File

@ -18,6 +18,9 @@ fi
if test -f /opt/local/bin/glibtoolize ; then if test -f /opt/local/bin/glibtoolize ; then
# darwin # darwin
LIBTOOLIZE=/opt/local/bin/glibtoolize LIBTOOLIZE=/opt/local/bin/glibtoolize
elif test -f /usr/local/bin/glibtoolize ; then
# also darwin
LIBTOOLIZE=/usr/local/bin/glibtoolize
else else
LIBTOOLIZE=libtoolize LIBTOOLIZE=libtoolize
fi fi


Loading…
Cancel
Save