From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
Date: Fri, 27 Nov 2015 00:35:13 +0000 (+0900)
Subject: Merge branch 'fh1.m_AddBuildBindingsOption' of https://github.com/FestusHagen/taglib... 
X-Git-Tag: v1.11beta~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b8e39e8f0d7ab8f88ae7fce9a182a814ccd520d;p=taglib

Merge branch 'fh1.m_AddBuildBindingsOption' of https://github.com/FestusHagen/taglib into FestusHagen-fh1.m_AddBuildBindingsOption

# Conflicts:
#	CMakeLists.txt
---

4b8e39e8f0d7ab8f88ae7fce9a182a814ccd520d
diff --cc CMakeLists.txt
index 985ceef6,a5e9bb9a..8dcb72b4
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -46,7 -47,8 +47,8 @@@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
  endif()
+ 
 -if (MSVC AND ENABLE_STATIC_RUNTIME)
 +if(MSVC AND ENABLE_STATIC_RUNTIME)
    foreach(flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
      string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
    endforeach(flag_var)
@@@ -77,9 -63,9 +79,9 @@@ endif(
  # 1. If the library source code has changed at all since the last update, then increment revision.
  # 2. If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0.
  # 3. If any interfaces have been added since the last public release, then increment age.
- # 4. If any interfaces have been removed since the last public release, then set age to 0. 
+ # 4. If any interfaces have been removed since the last public release, then set age to 0.
  set(TAGLIB_SOVERSION_CURRENT  16)
 -set(TAGLIB_SOVERSION_REVISION 0)
 +set(TAGLIB_SOVERSION_REVISION 1)
  set(TAGLIB_SOVERSION_AGE      15)
  
  math(EXPR TAGLIB_SOVERSION_MAJOR "${TAGLIB_SOVERSION_CURRENT} - ${TAGLIB_SOVERSION_AGE}")
@@@ -137,19 -130,10 +146,15 @@@ configure_file("${CMAKE_CURRENT_SOURCE_
  file(COPY doc/taglib.png DESTINATION doc)
  add_custom_target(docs doxygen)
  
 +find_program(CCACHE_FOUND ccache)
 +if(CCACHE_FOUND)
 +  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
 +  set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
 +endif()
 +
  # uninstall target
- configure_file(
-   "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
-   "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-   IMMEDIATE @ONLY)
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
  
 -if (NOT TARGET uninstall)
 +if(NOT TARGET uninstall)
-   add_custom_target(uninstall
-   COMMAND "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+   add_custom_target(uninstall COMMAND "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
  endif()
 -