mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-26 06:27:49 +08:00
66f1d9a747
* update shaderc * update shaderc * fix glslang cmake targets, re enable vcpkg_fixup_cmake_targets() * [spirv-tools] comment python distutils * remove comments, change path * glslang fix cmake targets * change version
27 lines
1.3 KiB
Diff
27 lines
1.3 KiB
Diff
diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt
|
|
index 9d07136..0ffa06f 100644
|
|
--- a/libshaderc/CMakeLists.txt
|
|
+++ b/libshaderc/CMakeLists.txt
|
|
@@ -84,7 +84,7 @@ if(SHADERC_ENABLE_INSTALL)
|
|
# around this problem by manually substitution.
|
|
string(REPLACE "$(Configuration)" "\${CMAKE_INSTALL_CONFIG_NAME}"
|
|
install_location "${generated_location}")
|
|
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${install_location} DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
+ install(FILES ${install_location} DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
else()
|
|
install(FILES ${generated_location} DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
endif()
|
|
diff --git a/libshaderc_spvc/CMakeLists.txt b/libshaderc_spvc/CMakeLists.txt
|
|
index fae235e..b503e70 100644
|
|
--- a/libshaderc_spvc/CMakeLists.txt
|
|
+++ b/libshaderc_spvc/CMakeLists.txt
|
|
@@ -84,7 +84,7 @@ if(SHADERC_ENABLE_INSTALL)
|
|
# around this problem by manually substitution.
|
|
string(REPLACE "$(Configuration)" "\${CMAKE_INSTALL_CONFIG_NAME}"
|
|
install_location "${generated_location}")
|
|
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${install_location} DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
+ install(FILES ${install_location} DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
else()
|
|
install(FILES ${generated_location} DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
endif()
|