diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-10-07 19:35:13 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-10-07 10:35:13 -0700 |
| commit | 726c11148105a97aef39bec024fdb7c140b1b154 (patch) | |
| tree | 26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/milerius-sfml-imgui/FixFindPackageIssue.patch | |
| parent | e86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff) | |
| download | vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip | |
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/milerius-sfml-imgui/FixFindPackageIssue.patch')
| -rw-r--r-- | ports/milerius-sfml-imgui/FixFindPackageIssue.patch | 106 |
1 files changed, 53 insertions, 53 deletions
diff --git a/ports/milerius-sfml-imgui/FixFindPackageIssue.patch b/ports/milerius-sfml-imgui/FixFindPackageIssue.patch index be47cfada..a3d8053dd 100644 --- a/ports/milerius-sfml-imgui/FixFindPackageIssue.patch +++ b/ports/milerius-sfml-imgui/FixFindPackageIssue.patch @@ -1,53 +1,53 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 27b8bd8..33fe623 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,7 +2,7 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
- message(FATAL_ERROR "Prevented in-tree built. Please create a build directory outside of the source code and call cmake from there")
- endif ()
-
--project(sfml-imgui)
-+project(milerius-sfml-imgui)
- cmake_minimum_required(VERSION 3.9)
- set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
-@@ -26,7 +26,7 @@ include(CMakePackageConfigHelpers)
-
- install(TARGETS
- ${PROJECT_NAME}
-- EXPORT sfml-imgui-targets
-+ EXPORT milerius-sfml-imgui-targets
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-@@ -39,7 +39,7 @@ install(EXPORT ${PROJECT_NAME}-targets
- )
-
- configure_package_config_file(
-- "${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}-config.cmake.in"
-+ "${PROJECT_SOURCE_DIR}/cmake/sfml-imgui-config.cmake.in"
- "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
- INSTALL_DESTINATION lib/cmake/${PROJECT_NAME}
- )
-@@ -51,6 +51,6 @@ install(FILES
- install(DIRECTORY
- ${CMAKE_CURRENT_SOURCE_DIR}/sfml-imgui
- DESTINATION
-- ${CMAKE_INSTALL_INCLUDEDIR}/sfml-imgui
-+ ${CMAKE_INSTALL_INCLUDEDIR}/
- FILES_MATCHING PATTERN "*.h*"
- )
-diff --git a/cmake/sfml-imgui-config.cmake.in b/cmake/sfml-imgui-config.cmake.in
-index cd790be..e1bdd77 100644
---- a/cmake/sfml-imgui-config.cmake.in
-+++ b/cmake/sfml-imgui-config.cmake.in
-@@ -2,5 +2,5 @@
- find_package(SFML CONFIG REQUIRED graphics)
- find_package(imgui CONFIG REQUIRED)
- find_package(OpenGL REQUIRED)
--include("${CMAKE_CURRENT_LIST_DIR}/sfml-imgui-targets.cmake")
--check_required_components("sfml-imgui")
-\ No newline at end of file
-+include("${CMAKE_CURRENT_LIST_DIR}/milerius-sfml-imgui-targets.cmake")
-+check_required_components("milerius-sfml-imgui")
-\ No newline at end of file
+diff --git a/CMakeLists.txt b/CMakeLists.txt +index 27b8bd8..33fe623 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,7 +2,7 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) + message(FATAL_ERROR "Prevented in-tree built. Please create a build directory outside of the source code and call cmake from there") + endif () + +-project(sfml-imgui) ++project(milerius-sfml-imgui) + cmake_minimum_required(VERSION 3.9) + set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + +@@ -26,7 +26,7 @@ include(CMakePackageConfigHelpers) + + install(TARGETS + ${PROJECT_NAME} +- EXPORT sfml-imgui-targets ++ EXPORT milerius-sfml-imgui-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +@@ -39,7 +39,7 @@ install(EXPORT ${PROJECT_NAME}-targets + ) + + configure_package_config_file( +- "${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}-config.cmake.in" ++ "${PROJECT_SOURCE_DIR}/cmake/sfml-imgui-config.cmake.in" + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake" + INSTALL_DESTINATION lib/cmake/${PROJECT_NAME} + ) +@@ -51,6 +51,6 @@ install(FILES + install(DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR}/sfml-imgui + DESTINATION +- ${CMAKE_INSTALL_INCLUDEDIR}/sfml-imgui ++ ${CMAKE_INSTALL_INCLUDEDIR}/ + FILES_MATCHING PATTERN "*.h*" + ) +diff --git a/cmake/sfml-imgui-config.cmake.in b/cmake/sfml-imgui-config.cmake.in +index cd790be..e1bdd77 100644 +--- a/cmake/sfml-imgui-config.cmake.in ++++ b/cmake/sfml-imgui-config.cmake.in +@@ -2,5 +2,5 @@ + find_package(SFML CONFIG REQUIRED graphics) + find_package(imgui CONFIG REQUIRED) + find_package(OpenGL REQUIRED) +-include("${CMAKE_CURRENT_LIST_DIR}/sfml-imgui-targets.cmake") +-check_required_components("sfml-imgui") +\ No newline at end of file ++include("${CMAKE_CURRENT_LIST_DIR}/milerius-sfml-imgui-targets.cmake") ++check_required_components("milerius-sfml-imgui") +\ No newline at end of file |
