aboutsummaryrefslogtreecommitdiff
path: root/ports/sdl2-net
diff options
context:
space:
mode:
authorAntonio Maiorano <amaiorano@gmail.com>2019-05-01 16:36:57 -0400
committerCurtis J Bezault <curtbezault@gmail.com>2019-05-01 13:36:57 -0700
commitdf753fbcf502574e182e302607d5db0fe9188cfd (patch)
tree05070df9d343992718f80836638b42b7a1b2dc11 /ports/sdl2-net
parent3468013fcd4014ab7a40b2b5355e86cbe4cbcf07 (diff)
downloadvcpkg-df753fbcf502574e182e302607d5db0fe9188cfd.tar.gz
vcpkg-df753fbcf502574e182e302607d5db0fe9188cfd.zip
Fix sdl2-gfx, sdl2-image, sdl2-mixer, sdl2-net, and sdl2-ttf forcing debug lib first (SDL2d) (#5948)
Prevent SDL2 dependent libraries from always linking against debug.
Diffstat (limited to 'ports/sdl2-net')
-rw-r--r--ports/sdl2-net/CMakeLists.txt6
-rw-r--r--ports/sdl2-net/CONTROL2
2 files changed, 4 insertions, 4 deletions
diff --git a/ports/sdl2-net/CMakeLists.txt b/ports/sdl2-net/CMakeLists.txt
index bb697bb46..053093643 100644
--- a/ports/sdl2-net/CMakeLists.txt
+++ b/ports/sdl2-net/CMakeLists.txt
@@ -6,7 +6,7 @@ if (MSVC)
endif()
find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
-find_library(SDL_LIBRARY NAMES SDL2d SDL2)
+find_package(SDL2 CONFIG REQUIRED)
add_library(SDL2_net SDLnet.c SDLnetselect.c SDLnetTCP.c SDLnetUDP.c version.rc)
@@ -15,7 +15,7 @@ target_compile_definitions(SDL2_net PRIVATE _WINSOCK_DEPRECATED_NO_WARNINGS)
target_include_directories(SDL2_net PRIVATE ${SDL_INCLUDE_DIR}/SDL2)
if (WIN32)
- target_link_libraries(SDL2_net ${SDL_LIBRARY} ws2_32 iphlpapi)
+ target_link_libraries(SDL2_net SDL2::SDL2 ws2_32 iphlpapi)
endif()
install(TARGETS SDL2_net
@@ -35,4 +35,4 @@ if(NOT DEFINED SDL_NET_SKIP_HEADERS)
endif()
message(STATUS "Link-time dependencies:")
-message(STATUS " " ${SDL_LIBRARY})
+message(STATUS " " SDL2::SDL2)
diff --git a/ports/sdl2-net/CONTROL b/ports/sdl2-net/CONTROL
index 56ee980be..e855e2656 100644
--- a/ports/sdl2-net/CONTROL
+++ b/ports/sdl2-net/CONTROL
@@ -1,4 +1,4 @@
Source: sdl2-net
-Version: 2.0.1-5
+Version: 2.0.1-6
Description: Networking library for SDL
Build-Depends: sdl2