diff --git a/CMakeLists.txt b/CMakeLists.txt index cc9116d..cc27fc4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,6 +66,9 @@ else() if (NOT IOS) add_definitions("-Werror") endif() + if(NOT ENABLE_TESTS) # test access inner functions so maintain visibility if we want to run tests + add_definitions("-fvisibility=hidden") + endif() endif() 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 ) +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") install(EXPORT Bcg729Targets FILE Bcg729Targets.cmake diff --git a/autogen.sh b/autogen.sh index db84113..9d1e7cf 100755 --- a/autogen.sh +++ b/autogen.sh @@ -18,6 +18,9 @@ fi if test -f /opt/local/bin/glibtoolize ; then # darwin LIBTOOLIZE=/opt/local/bin/glibtoolize +elif test -f /usr/local/bin/glibtoolize ; then + # also darwin + LIBTOOLIZE=/usr/local/bin/glibtoolize else LIBTOOLIZE=libtoolize fi