diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-03-11 23:41:51 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-03-11 23:42:54 -0700 |
| commit | 9f9778ccff48981a691bf34f30ecc4bf2efd5ac1 (patch) | |
| tree | 10ec609d13836ddc266345f441bae6f9e824056a /ports/libidn2 | |
| parent | ece289b9a6466dca885fd2555ed783d70dcad9bf (diff) | |
| download | vcpkg-9f9778ccff48981a691bf34f30ecc4bf2efd5ac1.tar.gz vcpkg-9f9778ccff48981a691bf34f30ecc4bf2efd5ac1.zip | |
[many ports] Improve behavior on Linux and general cleanup
Diffstat (limited to 'ports/libidn2')
| -rw-r--r-- | ports/libidn2/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | ports/libidn2/portfile.cmake | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ports/libidn2/CMakeLists.txt b/ports/libidn2/CMakeLists.txt index 9fbe1bcdd..a1eb9f9ce 100644 --- a/ports/libidn2/CMakeLists.txt +++ b/ports/libidn2/CMakeLists.txt @@ -2,9 +2,7 @@ cmake_minimum_required(VERSION 3.8) project(libidn2 C) -find_path(ICONV_INCLUDE_DIR iconv.h) -find_library(ICONV NAMES libiconv) -find_library(ICONV_CHARSET NAMES libcharset) +find_package(unofficial-iconv REQUIRED) set(CMAKE_DEBUG_POSTFIX "d") @@ -94,8 +92,8 @@ set(GL_SRC gl/rawmemchr.c add_library(libidn2 ${LIB_SRC} ${UNISTR_SRC} ${GL_SRC}) -target_include_directories(libidn2 PRIVATE . ./unistring ./gl ${ICONV_INCLUDE_DIR}) -target_link_libraries(libidn2 PRIVATE ${ICONV} ${ICONV_CHARSET}) +target_include_directories(libidn2 PRIVATE . ./unistring ./gl) +target_link_libraries(libidn2 PRIVATE unofficial::iconv::libiconv unofficial::iconv::libcharset) install(TARGETS libidn2 RUNTIME DESTINATION bin diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake index bbe8f7bbe..98892e2c0 100644 --- a/ports/libidn2/portfile.cmake +++ b/ports/libidn2/portfile.cmake @@ -35,6 +35,7 @@ simple_copy_template_header(${SOURCE_PATH}/unistring alloca) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA ) vcpkg_install_cmake() |