diff options
| author | Vitaliy Kirsanov <krokoziabla@yandex-team.ru> | 2019-04-29 12:48:24 +0300 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2019-05-04 11:41:48 +1000 |
| commit | 573dbc12ae3fc68e8edea08842f5864c553cd311 (patch) | |
| tree | b5d350a00d8b8b19dd10befe550fe5f86777416f /cmake | |
| parent | 1cb968a7d45eea5f45451981c32df79e5b798739 (diff) | |
| download | flac-573dbc12ae3fc68e8edea08842f5864c553cd311.tar.gz | |
Use of BUILD_SHARED_LIBS added
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindOGG.cmake | 25 | ||||
| -rw-r--r-- | cmake/UseSystemExtensions.cmake | 1 |
2 files changed, 6 insertions, 20 deletions
diff --git a/cmake/FindOGG.cmake b/cmake/FindOGG.cmake index 4b08040d..f9843455 100644 --- a/cmake/FindOGG.cmake +++ b/cmake/FindOGG.cmake @@ -9,31 +9,18 @@ find_library(OGG_LIBRARY NAMES ogg libogg HINTS ${_OGG_LIBRARY_DIRS}) -find_library(OGG_LIBRARY_STATIC - NAMES libogg.a libogg_static - HINTS ${_OGG_LIBRARY_DIRS}) - mark_as_advanced( OGG_INCLUDE_DIR - OGG_LIBRARY - OGG_LIBRARY_DIRS) + OGG_LIBRARY) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(OGG REQUIRED_VARS OGG_INCLUDE_DIR OGG_LIBRARY VERSION_VAR _OGG_VERSION) -if(OGG_FOUND) - if(NOT Ogg::Ogg) - add_library(Ogg::Ogg UNKNOWN IMPORTED) - set_target_properties(Ogg::Ogg PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${OGG_INCLUDE_DIR}" - IMPORTED_LOCATION "${OGG_LIBRARY}") - endif() - if(NOT Ogg::Ogg-static AND _OGG_LIBRARY_STATIC) - add_library(Ogg::Ogg-static STATIC IMPORTED) - set_target_properties(Ogg::Ogg-static PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${OGG_INCLUDE_DIR}" - IMPORTED_LOCATION "${OGG_LIBRARY_STATIC}") - endif() +if(OGG_FOUND AND NOT TARGET Ogg::Ogg) + add_library(Ogg::Ogg UNKNOWN IMPORTED) + set_target_properties(Ogg::Ogg PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${OGG_INCLUDE_DIR}" + IMPORTED_LOCATION "${OGG_LIBRARY}") endif() diff --git a/cmake/UseSystemExtensions.cmake b/cmake/UseSystemExtensions.cmake index 5ef9b470..f3c9490f 100644 --- a/cmake/UseSystemExtensions.cmake +++ b/cmake/UseSystemExtensions.cmake @@ -64,7 +64,6 @@ check_c_source_compiles(" add_definitions( -D_DARWIN_C_SOURCE -D_POSIX_PTHREAD_SEMANTICS - -D__STDC_WANT_IEC_60559_ATTRIBS_EXT__ -D__STDC_WANT_IEC_60559_BFP_EXT__ -D__STDC_WANT_IEC_60559_DFP_EXT__ -D__STDC_WANT_IEC_60559_FUNCS_EXT__ |