From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
Date: Wed, 2 Dec 2015 05:21:58 +0000 (+0900)
Subject: Merge branch 'cmake-allow-BUILD_SHARED_LIBS-to-drive-ENABLE_STATIC' of https://github... 
X-Git-Tag: v1.11beta~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea55c8b5c1e3b72789c302aa2560d9c87faedd40;p=taglib

Merge branch 'cmake-allow-BUILD_SHARED_LIBS-to-drive-ENABLE_STATIC' of https://github.com/tSed/taglib into tSed-cmake-allow-BUILD_SHARED_LIBS-to-drive-ENABLE_STATIC

# Conflicts:
#	CMakeLists.txt
#	examples/CMakeLists.txt
---

ea55c8b5c1e3b72789c302aa2560d9c87faedd40
diff --cc CMakeLists.txt
index 9491d47f,6265bb2f..b01022ce
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -8,34 -8,24 +8,34 @@@ endif(
  
  list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
  
- option(ENABLE_STATIC "Make static version of libtag" OFF)
- if(ENABLE_STATIC)
+ if(DEFINED ENABLE_STATIC)
+   message(FATAL_ERROR "This option is no longer available, use BUILD_SHARED_LIBS instead")
+ endif()
+ 
+ if(NOT BUILD_SHARED_LIBS)
    add_definitions(-DTAGLIB_STATIC)
-   set(BUILD_SHARED_LIBS OFF)
- else()
-   set(BUILD_SHARED_LIBS ON)
  endif()
 -OPTION(ENABLE_STATIC_RUNTIME "Visual Studio, link with runtime statically"  OFF)
 +option(ENABLE_STATIC_RUNTIME "Visual Studio, link with runtime statically" OFF)
 +
 +option(ENABLE_CCACHE "Use ccache when building libtag" OFF)
 +if(ENABLE_CCACHE)
 +  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()
 +endif()
  
 -option(VISIBILITY_HIDDEN "Build with -fvisibility=hidden"  OFF)
 +option(VISIBILITY_HIDDEN "Build with -fvisibility=hidden" OFF)
  if(VISIBILITY_HIDDEN)
 -  add_definitions (-fvisibility=hidden)
 +  add_definitions(-fvisibility=hidden)
  endif()
  
 -option(BUILD_TESTS "Build the test suite"  OFF)
 -option(BUILD_EXAMPLES "Build the examples"  OFF)
 +option(BUILD_TESTS "Build the test suite" OFF)
 +option(BUILD_EXAMPLES "Build the examples" OFF)
 +option(BUILD_BINDINGS "Build the bindings" ON)
  
 -option(NO_ITUNES_HACKS "Disable workarounds for iTunes bugs"  OFF)
 +option(NO_ITUNES_HACKS "Disable workarounds for iTunes bugs" OFF)
  
  add_definitions(-DHAVE_CONFIG_H)
  set(TESTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/")
diff --cc examples/CMakeLists.txt
index 7792a2a6,b25d4ff6..1d59f902
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@@ -1,16 -1,15 +1,16 @@@
 -if(BUILD_EXAMPLES)
 -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../taglib
 -		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/toolkit
 -		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/ape
 -		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg
 -		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg/id3v1
 -		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg/id3v2
 -		     ${CMAKE_CURRENT_SOURCE_DIR}/../bindings/c/  )
 +include_directories(
 +  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib
 +  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/toolkit
 +  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/ape
 +  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg
 +  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg/id3v1
 +  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg/id3v2
 +  ${CMAKE_CURRENT_SOURCE_DIR}/../bindings/c/
 +)
  
- if(ENABLE_STATIC)
+ if(NOT BUILD_SHARED_LIBS)
 -    add_definitions(-DTAGLIB_STATIC)
 +  add_definitions(-DTAGLIB_STATIC)
- endif(ENABLE_STATIC)
+ endif()
  
  ########### next target ###############