mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 01:59:01 +08:00
bb4de6fe3f
* [ms-gltf] create a new port * [ms-gltf] install with CMAKE_INSTALL_PREFIX * add a patch to change install path style * [ms-gltf] enable iOS/UWP & support features * feature: support tests/samples to help debugging in buildtrees * triplet: ios/uwp are now available * [ms-gltf] disable Ninja for Windows * [ms-gltf] format the manifest json * [ms-gltf] update expected failures * x64-linux * [ms-gltf] format the manifest json * [ms-gltf] update comments * [ms-gltf] make "test" default feature * [ms-gltf] add version JSON * Address the review suggestions * vcpkg x-add-version ms-gltf * [ms-gltf] fix 'x64-osx' triplet 'samples' feature * [ms-gltf] update git-tree of port Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
45 lines
2.2 KiB
Diff
45 lines
2.2 KiB
Diff
diff --git a/Build/CMake/Modules/GLTFPlatform.cmake b/Build/CMake/Modules/GLTFPlatform.cmake
|
|
index 3d940f5..322f029 100644
|
|
--- a/Build/CMake/Modules/GLTFPlatform.cmake
|
|
+++ b/Build/CMake/Modules/GLTFPlatform.cmake
|
|
@@ -55,14 +55,14 @@ endfunction(GetGLTFPlatform)
|
|
function(CreateGLTFInstallTargets target platform)
|
|
|
|
install(TARGETS ${target}
|
|
- ARCHIVE DESTINATION ${CMAKE_SOURCE_DIR}/Built/Out/${platform}/$<CONFIG>/${PROJECT_NAME}
|
|
- LIBRARY DESTINATION ${CMAKE_SOURCE_DIR}/Built/Out/${platform}/$<CONFIG>/${PROJECT_NAME}
|
|
- RUNTIME DESTINATION ${CMAKE_SOURCE_DIR}/Built/Out/${platform}/$<CONFIG>/${PROJECT_NAME}
|
|
- BUNDLE DESTINATION ${CMAKE_SOURCE_DIR}/Built/Out/${platform}/$<CONFIG>/${PROJECT_NAME}
|
|
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
|
|
+ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
|
|
+ RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
|
|
+ BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
|
|
)
|
|
|
|
if (MSVC)
|
|
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${PROJECT_NAME}.pdb DESTINATION ${CMAKE_SOURCE_DIR}/Built/Out/${platform}/$<CONFIG>/${PROJECT_NAME})
|
|
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${PROJECT_NAME}.pdb DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
|
|
endif()
|
|
|
|
endfunction(CreateGLTFInstallTargets)
|
|
diff --git a/GLTFSDK.Test/CMakeLists.txt b/GLTFSDK.Test/CMakeLists.txt
|
|
index 5c8eca7..a0752a3 100644
|
|
--- a/GLTFSDK.Test/CMakeLists.txt
|
|
+++ b/GLTFSDK.Test/CMakeLists.txt
|
|
@@ -46,4 +46,4 @@ add_custom_command(TARGET GLTFSDK.Test
|
|
AddGLTFIOSAppProperties(GLTFSDK.Test)
|
|
CreateGLTFInstallTargets(GLTFSDK.Test ${Platform})
|
|
|
|
-install(FILES ${PROJECT_BINARY_DIR}/$<CONFIG>/Resources/ DESTINATION ${CMAKE_SOURCE_DIR}/Built/Out/${Platform}/$<CONFIG>/${PROJECT_NAME}/Resources)
|
|
+install(FILES ${PROJECT_BINARY_DIR}/$<CONFIG>/Resources/ DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
|
|
diff --git a/GLTFSDK/CMakeLists.txt b/GLTFSDK/CMakeLists.txt
|
|
index 3c53c74..1e8d223 100644
|
|
--- a/GLTFSDK/CMakeLists.txt
|
|
+++ b/GLTFSDK/CMakeLists.txt
|
|
@@ -46,4 +46,5 @@ target_include_directories(GLTFSDK
|
|
PRIVATE "${CMAKE_BINARY_DIR}/GeneratedFiles"
|
|
)
|
|
|
|
+install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Inc/GLTFSDK DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
|
|
CreateGLTFInstallTargets(GLTFSDK ${Platform})
|