aboutsummaryrefslogtreecommitdiff
path: root/ports/teemo
diff options
context:
space:
mode:
Diffstat (limited to 'ports/teemo')
-rw-r--r--ports/teemo/CONTROL2
-rw-r--r--ports/teemo/adjust-install-dir.patch22
-rw-r--r--ports/teemo/portfile.cmake7
3 files changed, 28 insertions, 3 deletions
diff --git a/ports/teemo/CONTROL b/ports/teemo/CONTROL
index 2ee045a35..4d96fe5af 100644
--- a/ports/teemo/CONTROL
+++ b/ports/teemo/CONTROL
@@ -1,5 +1,5 @@
Source: teemo
-Version: 1.2
+Version: 1.2-1
Build-Depends: curl[non-http], cpprestsdk
Description: C++ File Download Library, support Multithreading, Breakpoint Transmission, Speed Limit, Real-time Speed.
Homepage: https://github.com/winsoft666/teemo \ No newline at end of file
diff --git a/ports/teemo/adjust-install-dir.patch b/ports/teemo/adjust-install-dir.patch
new file mode 100644
index 000000000..3ca1dcf56
--- /dev/null
+++ b/ports/teemo/adjust-install-dir.patch
@@ -0,0 +1,22 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 20de97c..0009c8a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -108,7 +108,7 @@ set_target_properties(${LIB_NAME}
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" )
+
+ target_include_directories(${LIB_NAME} INTERFACE
+- $<INSTALL_INTERFACE:include>)
++ $<INSTALL_INTERFACE:include/teemo>)
+
+ install(TARGETS ${LIB_NAME}
+ EXPORT ${LIB_NAME}-target
+@@ -117,7 +117,7 @@ install(TARGETS ${LIB_NAME}
+ ARCHIVE DESTINATION lib)
+
+
+-install(FILES ${HEADER_FILES} DESTINATION include)
++install(FILES ${HEADER_FILES} DESTINATION include/teemo)
+
+
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../CMake/teemo-config.cmake
diff --git a/ports/teemo/portfile.cmake b/ports/teemo/portfile.cmake
index df79626c0..07b5d5a53 100644
--- a/ports/teemo/portfile.cmake
+++ b/ports/teemo/portfile.cmake
@@ -6,6 +6,9 @@ vcpkg_from_github(
REF 15edb1705d18ee78b32516a8ae52d6b10507af62
SHA512 7dbe917d48b1e8c4b004bad33d8a82524e501d8bec6cdeca4e89ebbe8ed79fa484028c3afd365347e31fa83f64a6f0f5a42ea0063baa7c0985824fb3dffcc8f2
HEAD_REF master
+ PATCHES
+ # Installing "slice.h" to the root include directory causes build issues in many other libraries
+ adjust-install-dir.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" TEEMO_STATIC)
@@ -26,13 +29,13 @@ elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/teemo)
vcpkg_fixup_cmake_targets(CONFIG_PATH share/teemo)
endif()
-file(READ ${CURRENT_PACKAGES_DIR}/include/teemo.h TEEMO_H)
+file(READ ${CURRENT_PACKAGES_DIR}/include/teemo/teemo.h TEEMO_H)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
string(REPLACE "#ifdef TEEMO_STATIC" "#if 1" TEEMO_H "${TEEMO_H}")
else()
string(REPLACE "#ifdef TEEMO_STATIC" "#if 0" TEEMO_H "${TEEMO_H}")
endif()
-file(WRITE ${CURRENT_PACKAGES_DIR}/include/teemo.h "${TEEMO_H}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/include/teemo/teemo.h "${TEEMO_H}")
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)