diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt index d019843e..20bc4cc4 100644 --- a/bindings/CMakeLists.txt +++ b/bindings/CMakeLists.txt @@ -1 +1 @@ -add_subdirectory(c) +add_subdirectory(c) diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt index 4ce9fddb..67e95914 100644 --- a/bindings/c/CMakeLists.txt +++ b/bindings/c/CMakeLists.txt @@ -26,8 +26,7 @@ set_target_properties(tag_c PROPERTIES DEFINE_SYMBOL MAKE_TAGLIB_LIB ) if(VISIBILITY_HIDDEN) - set_target_properties(tag_c PROPERTIES C_VISIBILITY_PRESET hidden - ) + set_target_properties(tag_c PROPERTIES C_VISIBILITY_PRESET hidden) endif() if(BUILD_FRAMEWORK) set_target_properties(tag_c PROPERTIES FRAMEWORK TRUE) @@ -45,7 +44,7 @@ if(HAVE_CRUN_LIB) # the only game in town, the three available STLs -- Cstd, # stlport4 and stdcxx -- make this a mess. The KDE-Solaris # team supports stdcxx (Apache RogueWave stdcxx 4.1.3). - + # According to http://bugs.kde.org/show_bug.cgi?id=215225 the library can have the following two names: find_library(ROGUEWAVE_STDCXX_LIBRARY NAMES stdcxx4 stdcxx) if(NOT ROGUEWAVE_STDCXX_LIBRARY) @@ -61,25 +60,24 @@ set_target_properties(tag_c PROPERTIES INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR} ) install(TARGETS tag_c - FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/taglib + FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/taglib ) if(NOT BUILD_FRAMEWORK) - if(IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR}) - set(CMAKE_PC_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}) - else() - set(CMAKE_PC_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") - endif() - if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) - set(CMAKE_PC_LIBDIR ${CMAKE_INSTALL_LIBDIR}) - else() - set(CMAKE_PC_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}") - endif() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib_c.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + if(IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR}) + set(CMAKE_PC_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}) + else() + set(CMAKE_PC_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") + endif() + if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) + set(CMAKE_PC_LIBDIR ${CMAKE_INSTALL_LIBDIR}) + else() + set(CMAKE_PC_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}") + endif() + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib_c.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) endif() - diff --git a/taglib-config.cmake b/taglib-config.cmake index ec0834ab..203dad9f 100644 --- a/taglib-config.cmake +++ b/taglib-config.cmake @@ -2,16 +2,16 @@ usage() { - echo "usage: $0 [OPTIONS]" + echo "usage: $0 [OPTIONS]" cat << EOH options: - [--libs] - [--cflags] - [--version] - [--prefix] + [--libs] + [--cflags] + [--version] + [--prefix] EOH - exit 1; + exit 1 } # Looks useless as it is, but could be replaced with a "pcfiledir" by Buildroot. @@ -39,22 +39,22 @@ while test $# -gt 0 do case $1 in --libs) - flags="$flags -L$libdir -ltag @ZLIB_LIBRARIES_FLAGS@" - ;; + flags="$flags -L$libdir -ltag @ZLIB_LIBRARIES_FLAGS@" + ;; --cflags) - flags="$flags -I$includedir -I$includedir/taglib" - ;; + flags="$flags -I$includedir -I$includedir/taglib" + ;; --version) - echo @TAGLIB_LIB_VERSION_STRING@ - ;; + echo @TAGLIB_LIB_VERSION_STRING@ + ;; --prefix) - echo ${prefix:-@CMAKE_INSTALL_PREFIX@} - ;; - *) - echo "$0: unknown option $1" - echo - usage - ;; + echo ${prefix:-@CMAKE_INSTALL_PREFIX@} + ;; + *) + echo "$0: unknown option $1" + echo + usage + ;; esac shift done diff --git a/taglib-config.cmd.cmake b/taglib-config.cmd.cmake index 4e615c5e..136b84fb 100644 --- a/taglib-config.cmd.cmake +++ b/taglib-config.cmd.cmake @@ -14,11 +14,11 @@ if /i "%1#" == "--cflags#" goto doit if /i "%1#" == "--version#" goto doit if /i "%1#" == "--prefix#" goto doit -echo "usage: %0 [OPTIONS]" -echo [--libs] -echo [--cflags] -echo [--version] -echo [--prefix] +echo usage: %0 [OPTIONS] +echo [--libs] +echo [--cflags] +echo [--version] +echo [--prefix] goto theend * @@ -33,4 +33,3 @@ if /i "%1#" == "--version#" echo ${TAGLIB_LIB_VERSION_STRING} if /i "%1#" == "--prefix#" echo ${CMAKE_INSTALL_PREFIX} :theend -