diff options
| author | Connor Fitzgerald <connorwadefitzgerald@gmail.com> | 2019-03-07 02:43:44 -0500 |
|---|---|---|
| committer | Connor Fitzgerald <connorwadefitzgerald@gmail.com> | 2019-03-07 02:43:44 -0500 |
| commit | 8de9ab8fc416d110b8add61590e03c9690892b16 (patch) | |
| tree | 0f999dd5582323f60a4c4f2b8f4102650e89fe93 | |
| parent | 3af075eaf052ebbcd9c4a0b23bff06c940e9f19d (diff) | |
| download | vcpkg-8de9ab8fc416d110b8add61590e03c9690892b16.tar.gz vcpkg-8de9ab8fc416d110b8add61590e03c9690892b16.zip | |
[spirv-tools] Export all libraries
| -rw-r--r-- | ports/spirv-tools/CMake-targets.patch | 71 | ||||
| -rw-r--r-- | ports/spirv-tools/portfile.cmake | 2 |
2 files changed, 65 insertions, 8 deletions
diff --git a/ports/spirv-tools/CMake-targets.patch b/ports/spirv-tools/CMake-targets.patch index c88311b13..6b754e16b 100644 --- a/ports/spirv-tools/CMake-targets.patch +++ b/ports/spirv-tools/CMake-targets.patch @@ -1,5 +1,5 @@ diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt -index 2d7d7ca..ec6ca01 100644 +index 2d7d7ca..bf77be7 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -327,31 +327,41 @@ set_source_files_properties( @@ -45,18 +45,75 @@ index 2d7d7ca..ec6ca01 100644 if(ENABLE_SPIRV_TOOLS_INSTALL) - install(TARGETS ${SPIRV_TOOLS} ${SPIRV_TOOLS}-shared -+ install(TARGETS ${SPIRV_TOOLS} EXPORT ${SPIRV_TOOLS}Config ++ install(TARGETS ${SPIRV_TOOLS} EXPORT spirv-tools-config RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + export( + TARGETS ${SPIRV_TOOLS} -+ NAMESPACE ${SPIRV_TOOLS}:: -+ FILE "${CMAKE_CURRENT_BINARY_DIR}/${SPIRV_TOOLS}-config.cmake" ++ NAMESPACE spirv-tools:: ++ FILE "${CMAKE_CURRENT_BINARY_DIR}/spirv-tools-config.cmake" + ) + install( -+ EXPORT ${SPIRV_TOOLS}Config -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/${SPIRV_TOOLS}" -+ NAMESPACE ${SPIRV_TOOLS}:: ++ EXPORT spirv-tools-config ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/spirv-tools" ++ NAMESPACE spirv-tools:: + ) endif(ENABLE_SPIRV_TOOLS_INSTALL) +diff --git a/source/link/CMakeLists.txt b/source/link/CMakeLists.txt +index 8ca4df3..ac0aa62 100644 +--- a/source/link/CMakeLists.txt ++++ b/source/link/CMakeLists.txt +@@ -17,7 +17,7 @@ add_library(SPIRV-Tools-link + + spvtools_default_compile_options(SPIRV-Tools-link) + target_include_directories(SPIRV-Tools-link +- PUBLIC ${spirv-tools_SOURCE_DIR}/include ++ PUBLIC "$<BUILD_INTERFACE:${spirv-tools_SOURCE_DIR}/include>" + PUBLIC ${SPIRV_HEADER_INCLUDE_DIR} + PRIVATE ${spirv-tools_BINARY_DIR} + ) +@@ -29,8 +29,13 @@ set_property(TARGET SPIRV-Tools-link PROPERTY FOLDER "SPIRV-Tools libraries") + spvtools_check_symbol_exports(SPIRV-Tools-link) + + if(ENABLE_SPIRV_TOOLS_INSTALL) +- install(TARGETS SPIRV-Tools-link ++ install(TARGETS SPIRV-Tools-link EXPORT spirv-tools-config + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ export( ++ TARGETS ${SPIRV_TOOLS}-link ++ NAMESPACE spirv-tools:: ++ FILE "${CMAKE_CURRENT_BINARY_DIR}/spirv-tools-link-config.cmake" ++ ) + endif(ENABLE_SPIRV_TOOLS_INSTALL) +diff --git a/source/opt/CMakeLists.txt b/source/opt/CMakeLists.txt +index 854c950..fc91539 100644 +--- a/source/opt/CMakeLists.txt ++++ b/source/opt/CMakeLists.txt +@@ -159,7 +159,7 @@ add_library(SPIRV-Tools-opt + + spvtools_default_compile_options(SPIRV-Tools-opt) + target_include_directories(SPIRV-Tools-opt +- PUBLIC ${spirv-tools_SOURCE_DIR}/include ++ PUBLIC "$<BUILD_INTERFACE:${spirv-tools_SOURCE_DIR}/include>" + PUBLIC ${SPIRV_HEADER_INCLUDE_DIR} + PRIVATE ${spirv-tools_BINARY_DIR} + ) +@@ -171,9 +171,14 @@ set_property(TARGET SPIRV-Tools-opt PROPERTY FOLDER "SPIRV-Tools libraries") + spvtools_check_symbol_exports(SPIRV-Tools-opt) + + if(ENABLE_SPIRV_TOOLS_INSTALL) +- install(TARGETS SPIRV-Tools-opt ++ install(TARGETS SPIRV-Tools-opt EXPORT spirv-tools-config + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ export( ++ TARGETS ${SPIRV_TOOLS}-opt ++ NAMESPACE spirv-tools:: ++ FILE "${CMAKE_CURRENT_BINARY_DIR}/spirv-tools-opt-config.cmake" ++ ) + endif(ENABLE_SPIRV_TOOLS_INSTALL) + diff --git a/ports/spirv-tools/portfile.cmake b/ports/spirv-tools/portfile.cmake index 475f07340..bafe9dce5 100644 --- a/ports/spirv-tools/portfile.cmake +++ b/ports/spirv-tools/portfile.cmake @@ -45,4 +45,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bi file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/spirv-tools) file(RENAME ${CURRENT_PACKAGES_DIR}/share/spirv-tools/LICENSE ${CURRENT_PACKAGES_DIR}/share/spirv-tools/copyright) -vcpkg_test_cmake(PACKAGE_NAME SPIRV-Tools) +vcpkg_test_cmake(PACKAGE_NAME spirv-tools) |