diff options
Diffstat (limited to 'ports/libnice')
| -rw-r--r-- | ports/libnice/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | ports/libnice/CONTROL | 6 | ||||
| -rw-r--r-- | ports/libnice/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/libnice/vcpkg.json | 11 |
4 files changed, 20 insertions, 15 deletions
diff --git a/ports/libnice/CMakeLists.txt b/ports/libnice/CMakeLists.txt index 78224ecb2..0ca7cdafa 100644 --- a/ports/libnice/CMakeLists.txt +++ b/ports/libnice/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.19) project(libnice LANGUAGES C VERSION 0.1.15) @@ -20,10 +20,8 @@ endif() configure_file(${CMAKE_SOURCE_DIR}/win32/vs9/config.h ${CMAKE_SOURCE_DIR}/config.h COPYONLY) configure_file(${CMAKE_SOURCE_DIR}/win32/vs9/libnice.def ${CMAKE_SOURCE_DIR}/libnice.def COPYONLY) -find_path(GLIB_INCLUDE_DIR glib.h) -find_library(GLIB_LIBRARY glib-2.0) -find_library(GOBJECT_LIBRARY gobject-2.0) -find_library(GIO_LIBRARY gio-2.0) +find_package(PkgConfig REQUIRED) +pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 IMPORTED_TARGET) find_library(IPHLPAPI_LIBRARY iphlpapi) find_library(WS2_32_LIB ws2_32) find_library(ADVAPI32_LIB advapi32) @@ -34,7 +32,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/random ${CMAKE_CURRENT_SOURCE_DIR}/socket ${CMAKE_CURRENT_SOURCE_DIR}/stun - ${GLIB_INCLUDE_DIR}) + ${GLIB2_INCLUDE_DIRS}) SET (SRCS @@ -132,9 +130,9 @@ if (MSVC) set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4244 /wd4005 /wd4391 /wd4142 /wd4267") endif() if (WIN32) - target_link_libraries(libnice ${IPHLPAPI_LIBRARY} ${WS2_32_LIB} ${ADVAPI32_LIB} ${GLIB_LIBRARY} ${GOBJECT_LIBRARY} ${GIO_LIBRARY} OpenSSL::SSL) + target_link_libraries(libnice ${IPHLPAPI_LIBRARY} ${WS2_32_LIB} ${ADVAPI32_LIB} PkgConfig::GLIB2 OpenSSL::SSL) else() - target_link_libraries(libnice ${GLIB_LIBRARY} ${GOBJECT_LIBRARY} ${GIO_LIBRARY} OpenSSL::SSL) + target_link_libraries(libnice PkgConfig::GLIB2 OpenSSL::SSL) endif() install(TARGETS libnice RUNTIME DESTINATION bin diff --git a/ports/libnice/CONTROL b/ports/libnice/CONTROL deleted file mode 100644 index 106ee6064..000000000 --- a/ports/libnice/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libnice -Version: 0.1.15 -Port-Version: 6 -Homepage: https://nice.freedesktop.org -Description: Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal Utilities for NAT (STUN) standard (RFC 5389). -Build-Depends: glib, openssl diff --git a/ports/libnice/portfile.cmake b/ports/libnice/portfile.cmake index 2741712a3..038b21ebb 100644 --- a/ports/libnice/portfile.cmake +++ b/ports/libnice/portfile.cmake @@ -10,11 +10,13 @@ vcpkg_extract_source_archive_ex( ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - +vcpkg_find_acquire_program(PKGCONFIG) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} OPTIONS_RELEASE -DOPTIMIZE=1 OPTIONS_DEBUG -DDEBUGGABLE=1 ) diff --git a/ports/libnice/vcpkg.json b/ports/libnice/vcpkg.json new file mode 100644 index 000000000..16802d092 --- /dev/null +++ b/ports/libnice/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libnice", + "version": "0.1.15", + "port-version": 7, + "description": "Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal Utilities for NAT (STUN) standard (RFC 5389).", + "homepage": "https://nice.freedesktop.org", + "dependencies": [ + "glib", + "openssl" + ] +} |
