diff options
| author | myd7349 <myd7349@gmail.com> | 2019-02-23 16:16:50 +0800 |
|---|---|---|
| committer | myd7349 <myd7349@gmail.com> | 2019-02-23 16:16:50 +0800 |
| commit | b04cb5e35a721ea5a390a0d15c6b643e46c49b33 (patch) | |
| tree | 3a1b6f408498de124a9eefa83ffe6bf4c51ba8f0 | |
| parent | 373884761c6f4916530c38bd2fdce811311a259e (diff) | |
| download | vcpkg-b04cb5e35a721ea5a390a0d15c6b643e46c49b33.tar.gz vcpkg-b04cb5e35a721ea5a390a0d15c6b643e46c49b33.zip | |
[stxxl] Fix missing include directory exporting
| -rw-r--r-- | ports/stxxl/fix-include-dir.patch | 31 | ||||
| -rw-r--r-- | ports/stxxl/portfile.cmake | 2 |
2 files changed, 33 insertions, 0 deletions
diff --git a/ports/stxxl/fix-include-dir.patch b/ports/stxxl/fix-include-dir.patch new file mode 100644 index 000000000..043252fb6 --- /dev/null +++ b/ports/stxxl/fix-include-dir.patch @@ -0,0 +1,31 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 06f9e50a..281e1f04 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -94,6 +94,8 @@ if(BUILD_SHARED_LIBS) + add_library(stxxl SHARED ${LIBSTXXL_SOURCES}) + set_target_properties(stxxl PROPERTIES OUTPUT_NAME "${STXXL_LIBNAME}") + set_target_properties(stxxl PROPERTIES VERSION "${STXXL_VERSION_STRING}") ++ target_include_directories(stxxl PUBLIC $<INSTALL_INTERFACE:include>) ++ + install(TARGETS stxxl + EXPORT stxxl-targets + ARCHIVE DESTINATION ${INSTALL_LIB_DIR} +@@ -104,6 +106,8 @@ if(BUILD_SHARED_LIBS) + add_library(stxxl_static STATIC ${LIBSTXXL_SOURCES}) + set_target_properties(stxxl_static PROPERTIES OUTPUT_NAME "${STXXL_LIBNAME}") + set_target_properties(stxxl_static PROPERTIES VERSION "${STXXL_VERSION_STRING}") ++ target_include_directories(stxxl_static PUBLIC $<INSTALL_INTERFACE:include>) ++ + install(TARGETS stxxl_static + EXPORT stxxl-targets + ARCHIVE DESTINATION ${INSTALL_LIB_DIR}) +@@ -122,6 +126,8 @@ else() + add_library(stxxl STATIC ${LIBSTXXL_SOURCES}) + set_target_properties(stxxl PROPERTIES OUTPUT_NAME "${STXXL_LIBNAME}") + set_target_properties(stxxl PROPERTIES VERSION "${STXXL_VERSION_STRING}") ++ target_include_directories(stxxl PUBLIC $<INSTALL_INTERFACE:include>) ++ + install(TARGETS stxxl + EXPORT stxxl-targets + ARCHIVE DESTINATION ${INSTALL_LIB_DIR} diff --git a/ports/stxxl/portfile.cmake b/ports/stxxl/portfile.cmake index af574d287..f0f78573d 100644 --- a/ports/stxxl/portfile.cmake +++ b/ports/stxxl/portfile.cmake @@ -12,6 +12,8 @@ vcpkg_from_github( REF b9e44f0ecba7d7111fbb33f3330c3e53f2b75236 SHA512 800a8fb95b52b21256cecb848f95645c54851f4dc070e0cd64fb5009f7663c0c962a24ca3f246e54d6d45e81a5c734309268d7ea6f0b0987336a50a3dcb99616 HEAD_REF master + PATCHES + fix-include-dir.patch ) vcpkg_configure_cmake( |