diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-06-30 21:05:51 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-07-02 22:16:47 -0700 |
| commit | b08e78b07d4340a537f8d1470137883775a8902a (patch) | |
| tree | 98e3e558875e42d4c0a4cef8c9e0cbbad720f25e /ports/cmark | |
| parent | 3c16addc8c8e6516a4ee4edcb11c1fc428d38b96 (diff) | |
| download | vcpkg-b08e78b07d4340a537f8d1470137883775a8902a.tar.gz vcpkg-b08e78b07d4340a537f8d1470137883775a8902a.zip | |
[cmark][gl3w][libpopt][libraw][libssh][live555] Fixes, mostly around changing download locations.
Diffstat (limited to 'ports/cmark')
| -rw-r--r-- | ports/cmark/CONTROL | 2 | ||||
| -rw-r--r-- | ports/cmark/portfile.cmake | 9 | ||||
| -rw-r--r-- | ports/cmark/rename-shared-lib.patch | 12 |
3 files changed, 21 insertions, 2 deletions
diff --git a/ports/cmark/CONTROL b/ports/cmark/CONTROL index 4211c9bbc..6f756e824 100644 --- a/ports/cmark/CONTROL +++ b/ports/cmark/CONTROL @@ -1,3 +1,3 @@ Source: cmark -Version: 0.28.3-1 +Version: 0.28.3-2 Description: CommonMark parsing and rendering library diff --git a/ports/cmark/portfile.cmake b/ports/cmark/portfile.cmake index b452a4488..97324b4bf 100644 --- a/ports/cmark/portfile.cmake +++ b/ports/cmark/portfile.cmake @@ -11,6 +11,8 @@ vcpkg_from_github( REF 0.28.3 SHA512 409105a3228a8ae22ba6acf95cd99bc9a2c20f8603aa0e803a33172eb6ef53f80f8f0262d2258b77f9fd6e1f2e9017a6c906b88f761e053c09ef88c9ffab7d29 HEAD_REF master + PATCHES + "${CMAKE_CURRENT_LIST_DIR}/rename-shared-lib.patch" ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CMARK_STATIC) @@ -33,7 +35,12 @@ file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/cm file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") +if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/cmark.exe) + file(COPY ${CURRENT_PACKAGES_DIR}/bin/cmark.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/cmark/) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/cmark) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND NOT EXISTS ${CURRENT_PACKAGES_DIR}/bin/cmark) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) else() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/cmark.exe ${CURRENT_PACKAGES_DIR}/debug/bin/cmark.exe) diff --git a/ports/cmark/rename-shared-lib.patch b/ports/cmark/rename-shared-lib.patch new file mode 100644 index 000000000..79439aae1 --- /dev/null +++ b/ports/cmark/rename-shared-lib.patch @@ -0,0 +1,12 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index d5a1936..acff569 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -83,7 +83,6 @@ if (CMARK_SHARED)
+ add_library(${LIBRARY} SHARED ${LIBRARY_SOURCES})
+ # Include minor version and patch level in soname for now.
+ set_target_properties(${LIBRARY} PROPERTIES
+- OUTPUT_NAME "cmark"
+ SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
+ VERSION ${PROJECT_VERSION})
+
|