Attachment 236558 Details for Bug 266389 – git-patch_fix_if_yaml-cpp_googletest_installed.diff

[patch] git-patch_fix_if_yaml-cpp_googletest_installed.diff

git-patch_fix_if_yaml-cpp_googletest_installed.diff (text/plain), 1.64 KB, created by alt2600 on 2022-09-15 00:23:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: alt2600

Created: 2022-09-15 00:23:40 UTC

Size: 1.64 KB

patch

obsolete

>diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile
>index f3926df319fc..b2988adca019 100644
>--- a/devel/qtcreator/Makefile
>+++ b/devel/qtcreator/Makefile
>@@ -109,5 +109,8 @@ do-install-DOCS-on:
> # QmlDesigner needs Qt 6.2, remove its data for now.
> post-install:
> 	${RM} -r ${STAGEDIR}${DATADIR}/qmldesigner
>+post-patch:
>+# upstream has no option, so wipe finding googletest the second easiest way
>+	${ECHO_CMD} ' ' > ${WRKSRC}/cmake/FindGoogletest.cmake
> 
> .include <bsd.port.post.mk>
>diff --git a/devel/qtcreator/files/patch-cmake_Findyaml-cpp.cmake b/devel/qtcreator/files/patch-cmake_Findyaml-cpp.cmake
>new file mode 100644
>index 000000000000..783f2b7e07c1
>--- /dev/null
>+++ b/devel/qtcreator/files/patch-cmake_Findyaml-cpp.cmake
>@@ -0,0 +1,26 @@
>+--- cmake/Findyaml-cpp.cmake.orig	2022-09-14 19:28:18.419038000 -0400
>++++ cmake/Findyaml-cpp.cmake	2022-09-14 19:29:51.678883000 -0400
>+@@ -7,16 +7,7 @@
>+ #
>+ 
>+ find_package(yaml-cpp 0.5 QUIET NO_MODULE)
>+-if (yaml-cpp_FOUND)
>+-  # target doesn't set include directory for some reason
>+-  get_filename_component(yaml_cpp_include_dir "${YAML_CPP_INCLUDE_DIR}" ABSOLUTE)
>+-  if (NOT EXISTS yaml_cpp_include_dir)
>+-    unset(yaml_cpp_include_dir)
>+-    unset(yaml_cpp_include_dir CACHE)
>+-    find_path(yaml_cpp_include_dir yaml-cpp/yaml.h)
>+-  endif()
>+-  set_target_properties(yaml-cpp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}")
>+-else()
>++# must delete the if to force using bundled yaml-cpp, to handle case when yaml-cpp is installed on system
>+   if(TARGET yaml-cpp)
>+     return()
>+   endif()
>+@@ -128,4 +119,4 @@
>+       endif()
>+     endif()
>+     unset(YAML_SOURCE_DIR)
>+-endif()
>++

Actions: View | Diff

Attachments on bug 266389: 236523 | 236524 | 236558 | 236780