[live555] Fix header file cannot be found (microsoft#41730)

gavinltomra · Oct 26, 2024 · c8f60c5 · c8f60c5
1 parent ec20452
commit c8f60c5
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/ports/live555/CMakeLists.txt b/ports/live555/CMakeLists.txt
@@ -26,17 +26,20 @@ endif()
 
 file(GLOB BASIC_USAGE_ENVIRONMENT_SRCS BasicUsageEnvironment/*.c BasicUsageEnvironment/*.cpp)
 add_library(BasicUsageEnvironment ${BASIC_USAGE_ENVIRONMENT_SRCS})
+target_include_directories(BasicUsageEnvironment PUBLIC $<INSTALL_INTERFACE:include>)
 
 file(GLOB GROUPSOCK_SRCS groupsock/*.c groupsock/*.cpp)
 add_library(groupsock ${GROUPSOCK_SRCS})
+target_include_directories(groupsock PUBLIC $<INSTALL_INTERFACE:include>)
 
 file(GLOB LIVEMEDIA_SRCS liveMedia/*.c liveMedia/*.cpp)
 add_library(liveMedia ${LIVEMEDIA_SRCS})
 find_package(OpenSSL REQUIRED)
-target_include_directories(liveMedia PRIVATE "${OPENSSL_INCLUDE_DIR}")
+target_include_directories(liveMedia PRIVATE "${OPENSSL_INCLUDE_DIR}" PUBLIC $<INSTALL_INTERFACE:include>)
 
 file(GLOB USAGE_ENVIRONMENT_SRCS UsageEnvironment/*.c UsageEnvironment/*.cpp)
 add_library(UsageEnvironment ${USAGE_ENVIRONMENT_SRCS})
+target_include_directories(UsageEnvironment PUBLIC $<INSTALL_INTERFACE:include>)
 
 file(WRITE "${CMAKE_BINARY_DIR}/unofficial-live555-config.cmake"
 [[

diff --git a/ports/live555/portfile.cmake b/ports/live555/portfile.cmake
@@ -1,8 +1,9 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
+string(REPLACE "-" "." format_version ${VERSION})
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://live555.com/liveMedia/public/live.2024.10.24.tar.gz"
-    FILENAME "live.2024.10.24.tar.gz"
+    URLS "http://live555.com/liveMedia/public/live.${format_version}.tar.gz"
+    FILENAME "live.${format_version}.tar.gz"
     SHA512 59c36211317dd99d459f454a007a180ad33fdd568974c107caddcbb436f9b9c63fc05858d76bedb7f71b5f43e6850d484a973fd5f9d4acc68fb2b4d0e0de3835
 )
 

diff --git a/ports/live555/vcpkg.json b/ports/live555/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "live555",
   "version-date": "2024-10-24",
+  "port-version": 1,
   "description": "A complete RTSP server application",
   "homepage": "http://www.live555.com/liveMedia",
   "license": "GPL-3.0-or-later",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5522,7 +5522,7 @@
     },
     "live555": {
       "baseline": "2024-10-24",
-      "port-version": 0
+      "port-version": 1
     },
     "llfio": {
       "baseline": "2024-09-05",

diff --git a/versions/l-/live555.json b/versions/l-/live555.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "010c8abd8ac5913e985fece590dafc25ec881ab5",
+      "version-date": "2024-10-24",
+      "port-version": 1
+    },
     {
       "git-tree": "96a8593eb30850e7fa7aad8412e0206620ce3c3b",
       "version-date": "2024-10-24",