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 /CMakeLists.txt | |
| 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
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 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) |