- made ZMusic library required for non-MSVC targets

This commit is contained in:
alexey.lysiuk 2020-02-09 16:48:07 +02:00
parent 9c1703aac6
commit 30204d6072
2 changed files with 6 additions and 1 deletions

View file

@ -174,7 +174,6 @@ find_package( BZip2 )
find_package( JPEG ) find_package( JPEG )
find_package( VPX ) find_package( VPX )
find_package( ZLIB ) find_package( ZLIB )
find_package( ZMusic )
include( TargetArch ) include( TargetArch )

View file

@ -407,6 +407,12 @@ endif()
# ZMUSIC # ZMUSIC
if( MSVC )
find_package( ZMusic )
else()
find_package( ZMusic REQUIRED )
endif()
if( MSVC AND NOT ZMUSIC_FOUND ) if( MSVC AND NOT ZMUSIC_FOUND )
# Use prebuilt library # Use prebuilt library
set( ZMUSIC_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../bin/windows/zmusic" ) set( ZMUSIC_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../bin/windows/zmusic" )