diff options
| author | Tsuda Kageyu <tsuda.kageyu@gmail.com> | 2015-12-02 14:21:58 +0900 |
|---|---|---|
| committer | Tsuda Kageyu <tsuda.kageyu@gmail.com> | 2015-12-02 14:21:58 +0900 |
| commit | ea55c8b5c1e3b72789c302aa2560d9c87faedd40 (patch) | |
| tree | 516936f512702fb1ca2ce174ca5fa2ed80731065 | |
| parent | bc8b60ea46e2572c11b8a85cd9b9149b1efa2962 (diff) | |
| parent | 00c6e7ea79fb9b43afcb6011963f6d036ec87d7d (diff) | |
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
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | INSTALL | 8 | ||||
| -rw-r--r-- | examples/CMakeLists.txt | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9491d47f..b01022ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,12 +8,12 @@ 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) @@ -37,7 +37,7 @@ For a 10.6 Snow Leopard static library with both 32-bit and 64-bit code, use: cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_OSX_DEPLOYMENT_TARGET=10.6 \ -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" \ - -DENABLE_STATIC=ON \ + -DBUILD_SHARED_LIBS=OFF \ -DCMAKE_INSTALL_PREFIX="<folder you want to build to>" After 'make', and 'make install', add libtag.a to your XCode project, and add @@ -139,9 +139,9 @@ The easiest way is at the Command Prompt. 4. Select: Project Only 5. Select: Build Only INSTALL -To build a static library enable the following two options with CMake. - -DENABLE_STATIC=ON -DENABLE_STATIC_RUNTIME=ON - +To build a static library, set the following two options with CMake. + -DBUILD_SHARED_LIBS=OFF -DENABLE_STATIC_RUNTIME=ON + Including ENABLE_STATIC_RUNTIME=ON indicates you want TagLib built using the static runtime library, rather than the DLL form of the runtime. diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 7792a2a6..1d59f902 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -8,9 +8,9 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../bindings/c/ ) -if(ENABLE_STATIC) +if(NOT BUILD_SHARED_LIBS) add_definitions(-DTAGLIB_STATIC) -endif(ENABLE_STATIC) +endif() ########### next target ############### |