[vcpkg] fatal_error when patch fails to apply (#8087)

vcpkg will now fail on failure to apply patches except when using `--head`.

3 files changed, 12 insertions, 54 deletions

diff --git a/ports/sfgui/CONTROL b/ports/sfgui/CONTROL
index cd9f17ab9..944b8df2c 100644
--- a/ports/sfgui/CONTROL
+++ b/ports/sfgui/CONTROL
@@ -1,5 +1,5 @@
 Source: sfgui
-Version: 0.4.0
+Version: 0.4.0-2
 Homepage: https://github.com/TankOs/SFGUI
 Description: simple and fast graphical user interface library
 Build-Depends: sfml
diff --git a/ports/sfgui/portfile.cmake b/ports/sfgui/portfile.cmake
index 16eeb5618..9ab01a19e 100644
--- a/ports/sfgui/portfile.cmake
+++ b/ports/sfgui/portfile.cmake
@@ -6,7 +6,6 @@ vcpkg_from_github(
     REF 0.4.0
     SHA512 15456c6080b7095bcdcec08489b2b91b5cfc36cdf3c0b645b305072e7e835837eb4f95b59371ff176630b2b7ae51da475d8ea0bde5ff7fc0ba74c463bf5f54cf
     HEAD_REF master
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-sfml-targets.patch"
 )
 
 file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindSFML.cmake)
@@ -16,7 +15,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SFGUI_BUILD_SHARED_LIB
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS 
+    OPTIONS
         -DSFGUI_BUILD_DOC=OFF
         -DSFGUI_BUILD_EXAMPLES=OFF
         -DSFGUI_BUILD_SHARED_LIBS=${SFGUI_BUILD_SHARED_LIBS}
@@ -24,13 +23,16 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
-
-file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/sfgui RENAME copyright)
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+    file(GLOB_RECURSE SFGUI_DOC_RELEASE ${CURRENT_PACKAGES_DIR}/*.md)
+    file(GLOB_RECURSE SFGUI_DOC_DEBUG ${CURRENT_PACKAGES_DIR}/debug/*.md)
+    file(REMOVE ${SFGUI_DOC_RELEASE} ${SFGUI_DOC_DEBUG})
+else()
+    vcpkg_fixup_cmake_targets(CONFIG_PATH share/SFGUI/cmake)
+endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
-file(GLOB_RECURSE SFGUI_DOC_RELEASE ${CURRENT_PACKAGES_DIR}/*.md)
-file(GLOB_RECURSE SFGUI_DOC_DEBUG ${CURRENT_PACKAGES_DIR}/debug/*.md)
-file(REMOVE ${SFGUI_DOC_RELEASE} ${SFGUI_DOC_DEBUG})
+file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/sfgui RENAME copyright)
diff --git a/ports/sfgui/use-sfml-targets.patch b/ports/sfgui/use-sfml-targets.patch
deleted file mode 100644
index 337949f5a..000000000
--- a/ports/sfgui/use-sfml-targets.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt

-index abc9be0..eb999f5 100644

---- a/CMakeLists.txt

-+++ b/CMakeLists.txt

-@@ -190,7 +190,6 @@ endif()

- 

- include_directories( "${INCLUDE_PATH}" )

- include_directories( "${SOURCE_PATH}" )

--include_directories( SYSTEM "${SFML_INCLUDE_DIR}" )

- include_directories( SYSTEM "${PROJECT_SOURCE_DIR}/extlibs/libELL/include" )

- 

- # Set the library output directory

-@@ -244,7 +243,7 @@ if( WIN32 )

- 	endif()

- 

- 	add_definitions( -DWIN32 )

--	target_link_libraries( sfgui ${SFML_LIBRARIES} ${SFML_DEPENDENCIES} ${OPENGL_gl_LIBRARY} )

-+	target_link_libraries( sfgui sfml-graphics sfml-window sfml-system ${OPENGL_gl_LIBRARY} )

- 

- 	if( CMAKE_COMPILER_IS_GNUCXX )

- 		if( SFGUI_BUILD_SHARED_LIBS )

-@@ -261,11 +260,11 @@ elseif( APPLE )

- 	mark_as_advanced( COREFOUNDATION_LIBRARY )

- 

- 	include_directories( SYSTEM /System/Library/Frameworks/CoreFoundation.framework/Headers )

--	target_link_libraries( sfgui ${SFML_LIBRARIES} ${SFML_DEPENDENCIES} ${OPENGL_gl_LIBRARY} ${COREFOUNDATION_LIBRARY} )

-+	target_link_libraries( sfgui sfml-graphics sfml-window sfml-system ${OPENGL_gl_LIBRARY} ${COREFOUNDATION_LIBRARY} )

- 	set( SHARE_PATH "${CMAKE_INSTALL_PREFIX}/share/SFGUI" )

- 	set( LIB_PATH "lib" )

- elseif( "${CMAKE_SYSTEM_NAME}" MATCHES "Linux" )

--	target_link_libraries( sfgui ${SFML_LIBRARIES} ${SFML_DEPENDENCIES} ${OPENGL_gl_LIBRARY} ${X11_LIBRARIES} )

-+	target_link_libraries( sfgui sfml-graphics sfml-window sfml-system ${OPENGL_gl_LIBRARY} ${X11_LIBRARIES} )

- 	set( SHARE_PATH "${CMAKE_INSTALL_PREFIX}/share/SFGUI" )

- 	

- 	if( LIB_SUFFIX )

-@@ -274,7 +273,7 @@ elseif( "${CMAKE_SYSTEM_NAME}" MATCHES "Linux" )

- 		set( LIB_PATH "lib" )

- 	endif()

- else()

--	target_link_libraries( sfgui ${SFML_LIBRARIES} ${SFML_DEPENDENCIES} ${OPENGL_gl_LIBRARY} )

-+	target_link_libraries( sfgui sfml-graphics sfml-window sfml-system ${OPENGL_gl_LIBRARY} )

- 	set( SHARE_PATH "${CMAKE_INSTALL_PREFIX}/share/SFGUI" )

- 	set( LIB_PATH "lib" )

- endif()