diff options
| author | Martin Müller <muemart@users.noreply.github.com> | 2016-10-12 23:12:35 +0200 |
|---|---|---|
| committer | Martin Müller <muemart@users.noreply.github.com> | 2016-10-12 23:12:35 +0200 |
| commit | 7561bbd045fefc4be6a47395820194f6c36eb807 (patch) | |
| tree | 37a6dd4b1fa8207ce61c11738eeb2126e7d39529 | |
| parent | 2e35e0a145a583e2de8a0c337f18bb237b162c0e (diff) | |
| download | vcpkg-7561bbd045fefc4be6a47395820194f6c36eb807.tar.gz vcpkg-7561bbd045fefc4be6a47395820194f6c36eb807.zip | |
Remove unused headers and files
| -rw-r--r-- | ports/libiconv/CMakeLists.txt | 25 | ||||
| -rw-r--r-- | ports/libiconv/LibiconvConfig.cmake.in | 12 | ||||
| -rw-r--r-- | ports/libiconv/portfile.cmake | 1 |
3 files changed, 1 insertions, 37 deletions
diff --git a/ports/libiconv/CMakeLists.txt b/ports/libiconv/CMakeLists.txt index 043742c8e..5ef46f07d 100644 --- a/ports/libiconv/CMakeLists.txt +++ b/ports/libiconv/CMakeLists.txt @@ -30,9 +30,7 @@ include_directories(${Libiconv_SOURCE_DIR} ${Libiconv_BINARY_DIR}) set(libname libcharset) set(libcharset_source_dir ${Libiconv_SOURCE_DIR}/libcharset) -if(WIN32) - add_definitions(-DLIBDIR) -endif() +add_definitions(-DLIBDIR) configure_file( ${Libiconv_SOURCE_DIR}/libcharset/include/localcharset.h.build.in @@ -58,18 +56,6 @@ configure_file( ${Libiconv_BINARY_DIR}/iconv.h ) -list(APPEND simple_header_config - uniwidth - unitypes - ) - -foreach(header ${simple_header_config}) - configure_file( - ${Libiconv_SOURCE_DIR}/srclib/${header}.in.h - ${Libiconv_BINARY_DIR}/${header}.h - ) -endforeach() - set(${libname}_sources ${Libiconv_SOURCE_DIR}/lib/iconv.c ${Libiconv_BINARY_DIR}/iconv.h @@ -90,12 +76,3 @@ install(TARGETS ${Libiconv_TARGETS} ) install(FILES ${Libiconv_headers} DESTINATION include) - -set(Libiconv_TARGETS_FILE ${Libiconv_BINARY_DIR}/LibiconvTargets.cmake) -export(TARGETS ${Libiconv_TARGETS} FILE ${Libiconv_TARGETS_FILE}) - -configure_file( - ${Libiconv_SOURCE_DIR}/LibiconvConfig.cmake.in - ${Libiconv_BINARY_DIR}/LibiconvConfig.cmake - @ONLY -) diff --git a/ports/libiconv/LibiconvConfig.cmake.in b/ports/libiconv/LibiconvConfig.cmake.in deleted file mode 100644 index ec0df8f70..000000000 --- a/ports/libiconv/LibiconvConfig.cmake.in +++ /dev/null @@ -1,12 +0,0 @@ -# -# Use file for libiconv. Auto-generated, any change here might be overwritten -# without any warning. -# - -set(Libiconv_SOURCE_DIR "@Libiconv_SOURCE_DIR@") -set(Libiconv_BINARY_DIR "@Libiconv_BINARY_DIR@") -set(Libiconv_LIBRARIES "@Libiconv_TARGETS@") - -if(EXISTS "@Libiconv_TARGETS_FILE@" AND NOT TARGET libcharset) - include("@Libiconv_TARGETS_FILE@") -endif()
\ No newline at end of file diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index 2afc37836..e74d5ff21 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -8,7 +8,6 @@ vcpkg_extract_source_archive(${ARCHIVE}) #Since libiconv uses automake, make and configure, we use a custom CMake file file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${CURRENT_BUILDTREES_DIR}/src/libiconv-1.14/) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/LibiconvConfig.cmake.in DESTINATION ${CURRENT_BUILDTREES_DIR}/src/libiconv-1.14/) vcpkg_apply_patches( SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libiconv-1.14/ |