[edflib] Update to v1.24 (#31250)

* [edflib] Add dynamic build support * [edflib] Bump version * [edflib] Update to v1.24 * Revert "[edflib] Bump version" This reverts commit d45db16. * [edflib] Bump version
microsoft · May 5, 2023 · 6a3dd08 · 6a3dd08
1 parent 924d8d4
commit 6a3dd08
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 7 deletions.
diff --git a/ports/edflib/CMakeLists.txt b/ports/edflib/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 
-project(EDFlib VERSION 1.21 LANGUAGES C)
+project(EDFlib LANGUAGES C)
 
 option(BUILD_TOOLS "Build EDFlib tools." OFF)
 
@@ -10,6 +10,15 @@ set(sources edflib.h edflib.c)
 
 add_library(EDFlib ${sources})
 
+if(BUILD_SHARED_LIBS)
+    target_compile_definitions(EDFlib
+        PUBLIC
+            EDFLIB_SO_DLL
+        PRIVATE
+            $<BUILD_INTERFACE:EDFLIB_BUILD>
+    )
+endif()
+
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
     target_compile_definitions(EDFlib PRIVATE _LARGEFILE64_SOURCE _LARGEFILE_SOURCE)
     target_compile_options(EDFlib PRIVATE -Wall -Wextra -Wshadow -Wformat-nonliteral -Wformat-security)
@@ -21,6 +30,8 @@ install(TARGETS EDFlib
     EXPORT EDFlibTargets
     PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
     INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
 )
 

diff --git a/ports/edflib/portfile.cmake b/ports/edflib/portfile.cmake
@@ -1,11 +1,9 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
 vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.com
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Teuniz/EDFlib
-    REF v1.21
-    SHA512 6153cec44e26c0b9cd2f7e00d014f38ee7bdc444015eaf6169fecaf4aa16b04a552d3755ac83d48728de8dac7fe22cb2d0c9566f0fdc967e15bc3f000f456106
+    REF "v${VERSION}"
+    SHA512 3994d108efa45f49c4b9b68e6cfd10997b0c379631c1096dad7dd637cabe69c946d02e4204883308439ee5c9fe2382fc2f533ea14fe36bbbe6cedbaf04736b67
     HEAD_REF master
 )
 
@@ -25,8 +23,18 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
+vcpkg_copy_pdbs()
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    vcpkg_replace_string(
+        "${CURRENT_PACKAGES_DIR}/include/edflib.h"
+        "#if defined(EDFLIB_SO_DLL)"
+        "#if 1 // defined(EDFLIB_SO_DLL)"
+    )
+endif()
+
 vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-EDFlib)
 
 if ("tools" IN_LIST FEATURES)

diff --git a/ports/edflib/vcpkg.json b/ports/edflib/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "edflib",
-  "version": "1.21",
+  "version": "1.24",
   "description": "A C library to read/write EDF/EDF+/BDF/BDF+ files",
   "homepage": "https://www.teuniz.net/edflib/",
   "license": "BSD-3-Clause",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2257,7 +2257,7 @@
       "port-version": 3
     },
     "edflib": {
-      "baseline": "1.21",
+      "baseline": "1.24",
       "port-version": 0
     },
     "edlib": {

diff --git a/versions/e-/edflib.json b/versions/e-/edflib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1866b8a8e3db616811041a4f147a0dbed3db64cc",
+      "version": "1.24",
+      "port-version": 0
+    },
     {
       "git-tree": "161f6ffc0519e0944bce2573bbfb7ed800899690",
       "version": "1.21",