mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 05:57:55 +08:00
9c5b3024bb
* update spiv-{cross,tools,headers}
* update spriv-{cross,headers,tools} versions
* update versions
* fixup the C targets
* bump headers and remove shared lib from spirv-tools
* update versions.
* added fixup pkg-config
* update git version hash.
* format manifests
* git-trees
* Update ports/spirv-headers/vcpkg.json
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* Update ports/spirv-tools/portfile.cmake
* Update ports/spirv-cross/vcpkg.json
* update verson record
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
24 lines
701 B
Diff
24 lines
701 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 6ed56a8..66d1e66 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -210,15 +210,9 @@ else()
|
|
endif()
|
|
|
|
if(ENABLE_SPIRV_TOOLS_INSTALL)
|
|
- if(WIN32)
|
|
- macro(spvtools_config_package_dir TARGET PATH)
|
|
- set(${PATH} ${TARGET}/cmake)
|
|
- endmacro()
|
|
- else()
|
|
- macro(spvtools_config_package_dir TARGET PATH)
|
|
- set(${PATH} ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET})
|
|
- endmacro()
|
|
- endif()
|
|
+ macro(spvtools_config_package_dir TARGET PATH)
|
|
+ set(${PATH} ${CMAKE_INSTALL_DATADIR}/${TARGET})
|
|
+ endmacro()
|
|
|
|
macro(spvtools_generate_config_file TARGET)
|
|
file(WRITE ${CMAKE_BINARY_DIR}/${TARGET}Config.cmake
|