diff options
| author | myd7349 <myd7349@gmail.com> | 2019-05-27 19:15:06 +0800 |
|---|---|---|
| committer | myd7349 <myd7349@gmail.com> | 2019-05-27 19:15:06 +0800 |
| commit | 8999734b401bb8bac9fa20ce831b2ad2a9a67add (patch) | |
| tree | 3f5cf1d5abbbc4295b556ea6e27882950bdd81f3 /ports/smpeg2 | |
| parent | a7ac12c90afed0a13e3b24d509927d2fca506115 (diff) | |
| parent | 9ffac4d56eed774419fbb628ea89417a6399db58 (diff) | |
| download | vcpkg-8999734b401bb8bac9fa20ce831b2ad2a9a67add.tar.gz vcpkg-8999734b401bb8bac9fa20ce831b2ad2a9a67add.zip | |
Merge branch 'master' into rdkafka-init
Diffstat (limited to 'ports/smpeg2')
| -rw-r--r-- | ports/smpeg2/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | ports/smpeg2/CONTROL | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ports/smpeg2/CMakeLists.txt b/ports/smpeg2/CMakeLists.txt index 87a3586be..b0e284b05 100644 --- a/ports/smpeg2/CMakeLists.txt +++ b/ports/smpeg2/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6) project(SMPEG2 CXX) find_path(SDL_INCLUDE_DIR SDL2/SDL.h) -find_library(SDL_LIBRARY NAMES SDL2d SDL2) +find_package(SDL2 CONFIG REQUIRED) include_directories(${SDL_INCLUDE_DIR}) include_directories(${SDL_INCLUDE_DIR}/SDL2) @@ -46,7 +46,11 @@ add_library(smpeg2 smpeg.cpp) set_target_properties(smpeg2 PROPERTIES DEFINE_SYMBOL SDL2_EXPORTS) -target_link_libraries(smpeg2 ${SDL_LIBRARY}) +if(BUILD_SHARED_LIBS) + target_link_libraries(smpeg2 SDL2::SDL2) +else() + target_link_libraries(smpeg2 SDL2::SDL2-static) +endif() install(TARGETS smpeg2 RUNTIME DESTINATION bin diff --git a/ports/smpeg2/CONTROL b/ports/smpeg2/CONTROL index 0de1c4700..fc1e1604c 100644 --- a/ports/smpeg2/CONTROL +++ b/ports/smpeg2/CONTROL @@ -1,4 +1,4 @@ Source: smpeg2
-Version: 2.0.0-5
+Version: 2.0.0-6
Description: SDL MPEG Player Library
Build-Depends: sdl2
|