diff options
| author | sdcb <sdflysha@qq.com> | 2017-01-14 11:09:21 +0800 |
|---|---|---|
| committer | sdcb <sdflysha@qq.com> | 2017-01-14 11:09:21 +0800 |
| commit | bae23861132c5e746f7450a12fedd5f2b0e6b67c (patch) | |
| tree | f2d5c496421c85fe5dc5999cec32232e4a1b4d28 | |
| parent | beec44ae8d09b31a6c137bd580bd05111adc3077 (diff) | |
| download | vcpkg-bae23861132c5e746f7450a12fedd5f2b0e6b67c.tar.gz vcpkg-bae23861132c5e746f7450a12fedd5f2b0e6b67c.zip | |
fix UVAtlas build, I dropped the uvatlas tool.
| -rw-r--r-- | ports/uvatlas/CONTROL | 3 | ||||
| -rw-r--r-- | ports/uvatlas/portfile.cmake | 54 |
2 files changed, 26 insertions, 31 deletions
diff --git a/ports/uvatlas/CONTROL b/ports/uvatlas/CONTROL index 0e842d8fb..7fad35659 100644 --- a/ports/uvatlas/CONTROL +++ b/ports/uvatlas/CONTROL @@ -1,4 +1,3 @@ Source: uvatlas
Version: sept2016
-Description: UVAtlas isochart texture atlas
-Build-Depends: directxtex, directxmesh
\ No newline at end of file +Description: UVAtlas isochart texture atlas
\ No newline at end of file diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index 9f4bc5308..777742996 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -6,9 +6,9 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
#
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - message(STATUS "Warning: Dynamic building not supported yet. Building static.") - set(VCPKG_LIBRARY_LINKAGE static) +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+ message(STATUS "Warning: Dynamic building not supported yet. Building static.")
+ set(VCPKG_LIBRARY_LINKAGE static)
endif()
include(vcpkg_common_functions)
@@ -20,37 +20,33 @@ vcpkg_download_distfile(ARCHIVE )
vcpkg_extract_source_archive(${ARCHIVE})
-IF (TRIPLET_SYSTEM_ARCH MATCHES "x86") - SET(BUILD_ARCH "Win32") -ELSE() - SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH}) -ENDIF() - -vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/UVAtlas/UVAtlas_2015.sln - PLATFORM ${BUILD_ARCH} -)
-vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/UVAtlasTool/UVAtlasTool_2015.sln - PLATFORM ${BUILD_ARCH} +IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
+ SET(BUILD_ARCH "Win32")
+ELSE()
+ SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})
+ENDIF()
+
+vcpkg_build_msbuild(
+ PROJECT_PATH ${SOURCE_PATH}/UVAtlas/UVAtlas_2015.sln
+ PLATFORM ${BUILD_ARCH}
)
-file(INSTALL - ${SOURCE_PATH}/Inc/ +file(INSTALL
+ ${SOURCE_PATH}/UVAtlas/Inc/
DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(INSTALL - ${SOURCE_PATH}/UVAtlas/Bin/Desktop_2015/${BUILD_ARCH}/Release/UVAtlas.lib +file(INSTALL
+ ${SOURCE_PATH}/UVAtlas/Bin/Desktop_2015/${BUILD_ARCH}/Release/UVAtlas.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-file(INSTALL - ${SOURCE_PATH}/UVAtlas/Bin/Desktop_2015/${BUILD_ARCH}/Debug/UVAtlas.lib +file(INSTALL
+ ${SOURCE_PATH}/UVAtlas/Bin/Desktop_2015/${BUILD_ARCH}/Debug/UVAtlas.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-file(INSTALL - ${SOURCE_PATH}/UVAtlas/Bin/Desktop_2015/${BUILD_ARCH}/Debug/UVAtlas.lib +file(INSTALL
+ ${SOURCE_PATH}/UVAtlas/Bin/Desktop_2015/${BUILD_ARCH}/Debug/UVAtlas.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-file(INSTALL - ${SOURCE_PATH}/UVAtlasTool/Bin/Desktop_2015/${BUILD_ARCH}/Release/UVAtlasTool.exe - DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
# Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvatlas)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/uvatlas/LICENSE ${CURRENT_PACKAGES_DIR}/share/uvatlas/copyright)
+file(COPY ${SOURCE_PATH}/MIT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvatlas)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/uvatlas/MIT.txt ${CURRENT_PACKAGES_DIR}/share/uvatlas/copyright)
+
+message(STATUS "Installing done, uvatlastool.exe can be downloaded at: ")
+message(STATUS " https://github.com/Microsoft/UVAtlas/releases/download/sept2016/uvatlastool.exe")
\ No newline at end of file |