Attachment 239184 Details for Bug 267872 – CMake 3.25.1

[patch] CMake 3.25.1

patch-cmake-3.25.1 (text/plain), 23.27 KB, created by Adriaan de Groot on 2023-01-01 20:43:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adriaan de Groot

Created: 2023-01-01 20:43:18 UTC

Size: 23.27 KB

patch

obsolete

>diff --git Mk/Uses/cmake.mk Mk/Uses/cmake.mk
>index 8c02a6475155..d2063468fea0 100644
>--- Mk/Uses/cmake.mk
>+++ Mk/Uses/cmake.mk
>@@ -50,7 +50,7 @@ _INCLUDE_USES_CMAKE_MK=	yes
> 
> _valid_ARGS=		insource run noninja testing _internal
> 
>-_CMAKE_VERSION=		3.24.3
>+_CMAKE_VERSION=		3.25.1
> 
> # Sanity check
> .  for arg in ${cmake_ARGS}
>diff --git devel/cmake-core/Makefile devel/cmake-core/Makefile
>index 79c28ce3f4d7..950329c71223 100644
>--- devel/cmake-core/Makefile
>+++ devel/cmake-core/Makefile
>@@ -1,7 +1,6 @@
> PORTNAME=	cmake
> # Remember to update devel/cmake-doc and devel/cmake-gui as well.
> DISTVERSION=	${_CMAKE_VERSION}
>-PORTREVISION=	2
> CATEGORIES=	devel
> PKGNAMESUFFIX=	-core
> 
>@@ -40,12 +39,11 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
> 		--init="${WRKSRC}/InitialCache.cmake"
> 
> OPTIONS_DEFINE=	DOCS CPACK
>+OPTIONS_DEFAULT=	CPACK
> OPTIONS_SUB=	yes
> 
> CPACK_DESC=		Enable FreeBSD generator in CPack (experimental)
> CPACK_LIB_DEPENDS=	libpkg.so:${PKG_ORIGIN}
>-# CPACK_USES_OFF=		libarchive
>-# When CPACK is on, uses base libarchive and won't pass stage-qa
> 
> CXXFLAGS+=	-D__BSD_VISIBLE
> 
>diff --git devel/cmake-core/distinfo devel/cmake-core/distinfo
>index 1c32facb098a..31e39a49030c 100644
>--- devel/cmake-core/distinfo
>+++ devel/cmake-core/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1667324304
>-SHA256 (cmake-3.24.3.tar.gz) = b53aa10fa82bff84ccdb59065927b72d3bee49f4d86261249fc0984b3b367291
>-SIZE (cmake-3.24.3.tar.gz) = 10399876
>+TIMESTAMP = 1672089061
>+SHA256 (cmake-3.25.1.tar.gz) = 1c511d09516af493694ed9baf13c55947a36389674d657a2d5e0ccedc6b291d8
>+SIZE (cmake-3.25.1.tar.gz) = 10561054
>diff --git devel/cmake-core/files/InitialCache.cmake devel/cmake-core/files/InitialCache.cmake
>index ee769818debd..38e354586af1 100644
>--- devel/cmake-core/files/InitialCache.cmake
>+++ devel/cmake-core/files/InitialCache.cmake
>@@ -24,6 +24,6 @@ set(CPACK_ENABLE_FREEBSD_PKG @@CPACK_OPTION_VALUE@@ CACHE BOOL "Enable pkg(8) ge
> @@CPACK_OPTION_COMMENT@@    "Directory where LibArchive headers are located.")
> # Hack to (a) prevent using either ports libarchive or the bundled version 
> #     and (b) libpkg links to base libarchive.
>-@@CPACK_OPTION_COMMENT@@set(LibArchive_LIBRARY "/usr/lib/libthr.so;/usr/lib/libarchive.so" CACHE PATH
>+@@CPACK_OPTION_COMMENT@@set(LibArchive_LIBRARY "/usr/lib/libarchive.so" CACHE PATH
> @@CPACK_OPTION_COMMENT@@    "LibArchive library to link against.")
> 
>diff --git devel/cmake-core/files/patch-Modules_FindOpenMP.cmake devel/cmake-core/files/patch-Modules_FindOpenMP.cmake
>index a495d677abae..817b4abbb4c0 100644
>--- devel/cmake-core/files/patch-Modules_FindOpenMP.cmake
>+++ devel/cmake-core/files/patch-Modules_FindOpenMP.cmake
>@@ -7,7 +7,7 @@ Look for omp.h in LOCALBASE and pass suitable -I and -L flags
> if those are necessary. Also use OpenMP flags when linking.
> PR 223678 and PR 234050.
> 
>---- Modules/FindOpenMP.cmake.orig	2021-07-14 14:10:23 UTC
>+--- Modules/FindOpenMP.cmake.orig	2022-11-17 13:55:41 UTC
> +++ Modules/FindOpenMP.cmake
> @@ -97,6 +97,33 @@ cmake_policy(SET CMP0012 NEW) # if() recognizes number
>  cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
>@@ -43,7 +43,7 @@ PR 223678 and PR 234050.
>  function(_OPENMP_FLAG_CANDIDATES LANG)
>    if(NOT OpenMP_${LANG}_FLAG)
>      unset(OpenMP_FLAG_CANDIDATES)
>-@@ -212,6 +239,15 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_
>+@@ -211,6 +238,15 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_
>      if(OpenMP_VERBOSE_COMPILE_OPTIONS)
>        string(APPEND OPENMP_FLAGS_TEST " ${OpenMP_VERBOSE_COMPILE_OPTIONS}")
>      endif()
>@@ -57,8 +57,8 @@ PR 223678 and PR 234050.
> +    set(_need_extra FALSE)
> +
>      string(REGEX REPLACE "[-/=+]" "" OPENMP_PLAIN_FLAG "${OPENMP_FLAG}")
>-     try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG} ${CMAKE_BINARY_DIR} ${_OPENMP_TEST_SRC}
>-       CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${OPENMP_FLAGS_TEST}"
>+     try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG}
>+       SOURCE_FROM_VAR "${_OPENMP_TEST_SRC_NAME}" _OPENMP_TEST_SRC_CONTENT
> @@ -219,8 +255,23 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_
>        OUTPUT_VARIABLE OpenMP_TRY_COMPILE_OUTPUT
>      )
>@@ -84,7 +84,7 @@ PR 223678 and PR 234050.
>  
>        if(CMAKE_${LANG}_VERBOSE_FLAG)
>          unset(OpenMP_${LANG}_IMPLICIT_LIBRARIES)
>-@@ -567,9 +618,16 @@ foreach(LANG IN LISTS OpenMP_FINDLIST)
>+@@ -603,9 +654,16 @@ foreach(LANG IN LISTS OpenMP_FINDLIST)
>          add_library(OpenMP::OpenMP_${LANG} INTERFACE IMPORTED)
>        endif()
>        if(OpenMP_${LANG}_FLAGS)
>@@ -100,6 +100,6 @@ PR 223678 and PR 234050.
> +          INTERFACE_COMPILE_OPTIONS "$<$<COMPILE_LANGUAGE:${LANG}>:${_OpenMP_${LANG}_COMPILE_OPTIONS}>")
> +        set_property(TARGET OpenMP::OpenMP_${LANG} PROPERTY
> +          INTERFACE_LINK_OPTIONS "$<$<COMPILE_LANGUAGE:${LANG}>:${_OpenMP_${LANG}_LINK_OPTIONS}>")
>-         if(CMAKE_${LANG}_COMPILER_ID STREQUAL "Fujitsu")
>+         if(CMAKE_${LANG}_COMPILER_ID STREQUAL "Fujitsu"
>+           OR ${CMAKE_${LANG}_COMPILER_ID} STREQUAL "IntelLLVM")
>            set_property(TARGET OpenMP::OpenMP_${LANG} PROPERTY
>-             INTERFACE_LINK_OPTIONS "${OpenMP_${LANG}_FLAGS}")
>diff --git devel/cmake-core/files/patch-Modules_Platform_FreeBSD-CXX.cmake devel/cmake-core/files/patch-Modules_Platform_FreeBSD-CXX.cmake
>deleted file mode 100644
>index 5c0942686a6c..000000000000
>--- devel/cmake-core/files/patch-Modules_Platform_FreeBSD-CXX.cmake
>+++ /dev/null
>@@ -1,11 +0,0 @@
>-This prefers c++ over CC as the C++ compiler command. See PR 203793.
>-
>-Upstreamed as 6f666f4335c7f6b44fc4ccdc886590094fdfa16d
>-Will be included in CMake 3.10
>-
>---- Modules/Platform/FreeBSD-CXX.cmake.orig	2017-06-14 21:54:30 UTC
>-+++ Modules/Platform/FreeBSD-CXX.cmake
>-@@ -0,0 +1,3 @@
>-+if(NOT CMAKE_CXX_COMPILER_NAMES)
>-+  set(CMAKE_CXX_COMPILER_NAMES c++)
>-+endif()
>diff --git devel/cmake-core/files/patch-Source_CPack_cmCPackFreeBSDGenerator.cxx devel/cmake-core/files/patch-Source_CPack_cmCPackFreeBSDGenerator.cxx
>new file mode 100644
>index 000000000000..c07173192de8
>--- /dev/null
>+++ devel/cmake-core/files/patch-Source_CPack_cmCPackFreeBSDGenerator.cxx
>@@ -0,0 +1,22 @@
>+diff --git Source/CPack/cmCPackFreeBSDGenerator.cxx Source/CPack/cmCPackFreeBSDGenerator.cxx
>+index 162dfc7346..206f2d06a0 100644
>+--- Source/CPack/cmCPackFreeBSDGenerator.cxx
>++++ Source/CPack/cmCPackFreeBSDGenerator.cxx
>+@@ -245,8 +245,15 @@ public:
>+   void write_value(cmGeneratedFileStream& s) const override
>+   {
>+     s << "{\n";
>+-    for (std::string const& elem : value) {
>+-      s << "  \"" << elem << R"(": {"origin": ")" << elem << "\"},\n";
>++    for (std::string const& origin : value) {
>++      // Split the origin into its category and name components.
>++      // Treat it like a path (which it sort-of is, in the ports tree).
>++      // Because it is a "cat/name" style relative path, it gets split
>++      // into "" "cat" and "name" parts.
>++      std::vector<std::string> originComponents;
>++      cmSystemTools::SplitPath(origin, originComponents);
>++      const std::string name = (originComponents.size() == 3) ? originComponents[2] : origin;
>++      s << "  \"" << name << R"(": {"origin": ")" << origin << "\"},\n";
>+     }
>+     s << '}';
>+   }
>diff --git devel/cmake-core/pkg-plist devel/cmake-core/pkg-plist
>index 44e0fc3b467b..5834a007fb34 100644
>--- devel/cmake-core/pkg-plist
>+++ devel/cmake-core/pkg-plist
>@@ -2,10 +2,6 @@ bin/ccmake
> bin/cmake
> bin/cpack
> bin/ctest
>-share/aclocal/cmake.m4
>-share/bash-completion/completions/cmake
>-share/bash-completion/completions/cpack
>-share/bash-completion/completions/ctest
> %%DATADIR%%/Help/command/DEVICE_LINK_OPTIONS.txt
> %%DATADIR%%/Help/command/FIND_XXX.txt
> %%DATADIR%%/Help/command/FIND_XXX_ORDER.txt
>@@ -25,6 +21,7 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Help/command/add_subdirectory.rst
> %%DATADIR%%/Help/command/add_test.rst
> %%DATADIR%%/Help/command/aux_source_directory.rst
>+%%DATADIR%%/Help/command/block.rst
> %%DATADIR%%/Help/command/break.rst
> %%DATADIR%%/Help/command/build_command.rst
> %%DATADIR%%/Help/command/build_name.rst
>@@ -55,6 +52,7 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Help/command/elseif.rst
> %%DATADIR%%/Help/command/enable_language.rst
> %%DATADIR%%/Help/command/enable_testing.rst
>+%%DATADIR%%/Help/command/endblock.rst
> %%DATADIR%%/Help/command/endforeach.rst
> %%DATADIR%%/Help/command/endfunction.rst
> %%DATADIR%%/Help/command/endif.rst
>@@ -198,6 +196,7 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Help/envvar/HIPFLAGS.rst
> %%DATADIR%%/Help/envvar/ISPC.rst
> %%DATADIR%%/Help/envvar/ISPCFLAGS.rst
>+%%DATADIR%%/Help/envvar/LANG_FLAGS.txt
> %%DATADIR%%/Help/envvar/LDFLAGS.rst
> %%DATADIR%%/Help/envvar/MACOSX_DEPLOYMENT_TARGET.rst
> %%DATADIR%%/Help/envvar/OBJC.rst
>@@ -205,6 +204,8 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Help/envvar/PackageName_ROOT.rst
> %%DATADIR%%/Help/envvar/RC.rst
> %%DATADIR%%/Help/envvar/RCFLAGS.rst
>+%%DATADIR%%/Help/envvar/SSL_CERT_DIR.rst
>+%%DATADIR%%/Help/envvar/SSL_CERT_FILE.rst
> %%DATADIR%%/Help/envvar/SWIFTC.rst
> %%DATADIR%%/Help/envvar/VERBOSE.rst
> %%DATADIR%%/Help/generator/Borland Makefiles.rst
>@@ -435,6 +436,7 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Help/module/FindOpenCL.rst
> %%DATADIR%%/Help/module/FindOpenGL.rst
> %%DATADIR%%/Help/module/FindOpenMP.rst
>+%%DATADIR%%/Help/module/FindOpenSP.rst
> %%DATADIR%%/Help/module/FindOpenSSL.rst
> %%DATADIR%%/Help/module/FindOpenSceneGraph.rst
> %%DATADIR%%/Help/module/FindOpenThreads.rst
>@@ -463,6 +465,7 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Help/module/FindRTI.rst
> %%DATADIR%%/Help/module/FindRuby.rst
> %%DATADIR%%/Help/module/FindSDL.rst
>+%%DATADIR%%/Help/module/FindSDL_gfx.rst
> %%DATADIR%%/Help/module/FindSDL_image.rst
> %%DATADIR%%/Help/module/FindSDL_mixer.rst
> %%DATADIR%%/Help/module/FindSDL_net.rst
>@@ -677,6 +680,9 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Help/policy/CMP0137.rst
> %%DATADIR%%/Help/policy/CMP0138.rst
> %%DATADIR%%/Help/policy/CMP0139.rst
>+%%DATADIR%%/Help/policy/CMP0140.rst
>+%%DATADIR%%/Help/policy/CMP0141.rst
>+%%DATADIR%%/Help/policy/CMP0142.rst
> %%DATADIR%%/Help/policy/DEPRECATED.txt
> %%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt
> %%DATADIR%%/Help/prop_cache/ADVANCED.rst
>@@ -714,6 +720,7 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Help/prop_dir/RULE_LAUNCH_LINK.rst
> %%DATADIR%%/Help/prop_dir/SOURCE_DIR.rst
> %%DATADIR%%/Help/prop_dir/SUBDIRECTORIES.rst
>+%%DATADIR%%/Help/prop_dir/SYSTEM.rst
> %%DATADIR%%/Help/prop_dir/TESTS.rst
> %%DATADIR%%/Help/prop_dir/TEST_INCLUDE_FILE.rst
> %%DATADIR%%/Help/prop_dir/TEST_INCLUDE_FILES.rst
>@@ -924,6 +931,16 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Help/prop_tgt/CUDA_STANDARD.rst
> %%DATADIR%%/Help/prop_tgt/CUDA_STANDARD_REQUIRED.rst
> %%DATADIR%%/Help/prop_tgt/CXX_EXTENSIONS.rst
>+%%DATADIR%%/Help/prop_tgt/CXX_MODULE_DIRS.rst
>+%%DATADIR%%/Help/prop_tgt/CXX_MODULE_DIRS_NAME.rst
>+%%DATADIR%%/Help/prop_tgt/CXX_MODULE_HEADER_UNIT_DIRS.rst
>+%%DATADIR%%/Help/prop_tgt/CXX_MODULE_HEADER_UNIT_DIRS_NAME.rst
>+%%DATADIR%%/Help/prop_tgt/CXX_MODULE_HEADER_UNIT_SET.rst
>+%%DATADIR%%/Help/prop_tgt/CXX_MODULE_HEADER_UNIT_SETS.rst
>+%%DATADIR%%/Help/prop_tgt/CXX_MODULE_HEADER_UNIT_SET_NAME.rst
>+%%DATADIR%%/Help/prop_tgt/CXX_MODULE_SET.rst
>+%%DATADIR%%/Help/prop_tgt/CXX_MODULE_SETS.rst
>+%%DATADIR%%/Help/prop_tgt/CXX_MODULE_SET_NAME.rst
> %%DATADIR%%/Help/prop_tgt/CXX_STANDARD.rst
> %%DATADIR%%/Help/prop_tgt/CXX_STANDARD_REQUIRED.rst
> %%DATADIR%%/Help/prop_tgt/C_EXTENSIONS.rst
>@@ -944,6 +961,7 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Help/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD_CONFIG.rst
> %%DATADIR%%/Help/prop_tgt/EXPORT_COMPILE_COMMANDS.rst
> %%DATADIR%%/Help/prop_tgt/EXPORT_NAME.rst
>+%%DATADIR%%/Help/prop_tgt/EXPORT_NO_SYSTEM.rst
> %%DATADIR%%/Help/prop_tgt/EXPORT_PROPERTIES.rst
> %%DATADIR%%/Help/prop_tgt/EchoString.rst
> %%DATADIR%%/Help/prop_tgt/FOLDER.rst
>@@ -1006,6 +1024,8 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Help/prop_tgt/INTERFACE_COMPILE_DEFINITIONS.rst
> %%DATADIR%%/Help/prop_tgt/INTERFACE_COMPILE_FEATURES.rst
> %%DATADIR%%/Help/prop_tgt/INTERFACE_COMPILE_OPTIONS.rst
>+%%DATADIR%%/Help/prop_tgt/INTERFACE_CXX_MODULE_HEADER_UNIT_SETS.rst
>+%%DATADIR%%/Help/prop_tgt/INTERFACE_CXX_MODULE_SETS.rst
> %%DATADIR%%/Help/prop_tgt/INTERFACE_HEADER_SETS.rst
> %%DATADIR%%/Help/prop_tgt/INTERFACE_HEADER_SETS_TO_VERIFY.rst
> %%DATADIR%%/Help/prop_tgt/INTERFACE_INCLUDE_DIRECTORIES.rst
>@@ -1073,6 +1093,8 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Help/prop_tgt/MACOSX_RPATH.rst
> %%DATADIR%%/Help/prop_tgt/MANUALLY_ADDED_DEPENDENCIES.rst
> %%DATADIR%%/Help/prop_tgt/MAP_IMPORTED_CONFIG_CONFIG.rst
>+%%DATADIR%%/Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT-VALUES.txt
>+%%DATADIR%%/Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT.rst
> %%DATADIR%%/Help/prop_tgt/MSVC_RUNTIME_LIBRARY-VALUES.txt
> %%DATADIR%%/Help/prop_tgt/MSVC_RUNTIME_LIBRARY.rst
> %%DATADIR%%/Help/prop_tgt/NAME.rst
>@@ -1121,6 +1143,7 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_FLAGS_CONFIG.rst
> %%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_OPTIONS.rst
> %%DATADIR%%/Help/prop_tgt/SUFFIX.rst
>+%%DATADIR%%/Help/prop_tgt/SYSTEM.rst
> %%DATADIR%%/Help/prop_tgt/Swift_DEPENDENCIES_FILE.rst
> %%DATADIR%%/Help/prop_tgt/Swift_LANGUAGE_VERSION.rst
> %%DATADIR%%/Help/prop_tgt/Swift_MODULE_DIRECTORY.rst
>@@ -1198,10 +1221,14 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER.rst
> %%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS.rst
> %%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_ENABLE_GPU_API_VALIDATION.rst
> %%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_ENABLE_GPU_SHADER_VALIDATION.rst
> %%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_ENVIRONMENT.rst
> %%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_EXECUTABLE.rst
> %%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_GUARD_MALLOC.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_LAUNCH_CONFIGURATION.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_LAUNCH_MODE.rst
> %%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP.rst
> %%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_MALLOC_GUARD_EDGES.rst
> %%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_MALLOC_SCRIBBLE.rst
>@@ -1234,6 +1261,7 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Help/release/3.22.rst
> %%DATADIR%%/Help/release/3.23.rst
> %%DATADIR%%/Help/release/3.24.rst
>+%%DATADIR%%/Help/release/3.25.rst
> %%DATADIR%%/Help/release/3.3.rst
> %%DATADIR%%/Help/release/3.4.rst
> %%DATADIR%%/Help/release/3.5.rst
>@@ -1246,6 +1274,7 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Help/variable/ANDROID.rst
> %%DATADIR%%/Help/variable/APPLE.rst
> %%DATADIR%%/Help/variable/BORLAND.rst
>+%%DATADIR%%/Help/variable/BSD.rst
> %%DATADIR%%/Help/variable/BUILD_SHARED_LIBS.rst
> %%DATADIR%%/Help/variable/CACHE.rst
> %%DATADIR%%/Help/variable/CMAKE_ABSOLUTE_DESTINATION_FILES.rst
>@@ -1455,6 +1484,8 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Help/variable/CMAKE_HIP_STANDARD_REQUIRED.rst
> %%DATADIR%%/Help/variable/CMAKE_HOME_DIRECTORY.rst
> %%DATADIR%%/Help/variable/CMAKE_HOST_APPLE.rst
>+%%DATADIR%%/Help/variable/CMAKE_HOST_BSD.rst
>+%%DATADIR%%/Help/variable/CMAKE_HOST_LINUX.rst
> %%DATADIR%%/Help/variable/CMAKE_HOST_SOLARIS.rst
> %%DATADIR%%/Help/variable/CMAKE_HOST_SYSTEM.rst
> %%DATADIR%%/Help/variable/CMAKE_HOST_SYSTEM_NAME.rst
>@@ -1611,6 +1642,7 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Help/variable/CMAKE_MODULE_LINKER_FLAGS_INIT.rst
> %%DATADIR%%/Help/variable/CMAKE_MODULE_PATH.rst
> %%DATADIR%%/Help/variable/CMAKE_MSVCIDE_RUN_PATH.rst
>+%%DATADIR%%/Help/variable/CMAKE_MSVC_DEBUG_INFORMATION_FORMAT.rst
> %%DATADIR%%/Help/variable/CMAKE_MSVC_RUNTIME_LIBRARY.rst
> %%DATADIR%%/Help/variable/CMAKE_NETRC.rst
> %%DATADIR%%/Help/variable/CMAKE_NETRC_FILE.rst
>@@ -1705,6 +1737,7 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Help/variable/CMAKE_Swift_LANGUAGE_VERSION.rst
> %%DATADIR%%/Help/variable/CMAKE_Swift_MODULE_DIRECTORY.rst
> %%DATADIR%%/Help/variable/CMAKE_Swift_NUM_THREADS.rst
>+%%DATADIR%%/Help/variable/CMAKE_TASKING_TOOLSET.rst
> %%DATADIR%%/Help/variable/CMAKE_TLS_CAINFO.rst
> %%DATADIR%%/Help/variable/CMAKE_TLS_VERIFY.rst
> %%DATADIR%%/Help/variable/CMAKE_TOOLCHAIN_FILE.rst
>@@ -1770,9 +1803,13 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER.rst
> %%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS.rst
> %%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE.rst
>+%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_ENABLE_GPU_API_VALIDATION.rst
> %%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE.rst
>+%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_ENABLE_GPU_SHADER_VALIDATION.rst
> %%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_ENVIRONMENT.rst
> %%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_GUARD_MALLOC.rst
>+%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_LAUNCH_CONFIGURATION.rst
>+%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_LAUNCH_MODE.rst
> %%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP.rst
> %%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_MALLOC_GUARD_EDGES.rst
> %%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_MALLOC_SCRIBBLE.rst
>@@ -1883,6 +1920,7 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Help/variable/LIBRARY_OUTPUT_PATH.rst
> %%DATADIR%%/Help/variable/LINK_GROUP_PREDEFINED_FEATURES.txt
> %%DATADIR%%/Help/variable/LINK_LIBRARY_PREDEFINED_FEATURES.txt
>+%%DATADIR%%/Help/variable/LINUX.rst
> %%DATADIR%%/Help/variable/MINGW.rst
> %%DATADIR%%/Help/variable/MSVC.rst
> %%DATADIR%%/Help/variable/MSVC10.rst
>@@ -2259,6 +2297,7 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Modules/Compiler/IntelLLVM-C.cmake
> %%DATADIR%%/Modules/Compiler/IntelLLVM-CXX.cmake
> %%DATADIR%%/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake
>+%%DATADIR%%/Modules/Compiler/IntelLLVM-FindBinUtils.cmake
> %%DATADIR%%/Modules/Compiler/IntelLLVM-Fortran.cmake
> %%DATADIR%%/Modules/Compiler/IntelLLVM.cmake
> %%DATADIR%%/Modules/Compiler/LCC-C-DetermineCompiler.cmake
>@@ -2325,6 +2364,12 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Modules/Compiler/TI-CXX.cmake
> %%DATADIR%%/Modules/Compiler/TI-DetermineCompiler.cmake
> %%DATADIR%%/Modules/Compiler/TI.cmake
>+%%DATADIR%%/Modules/Compiler/Tasking-ASM.cmake
>+%%DATADIR%%/Modules/Compiler/Tasking-C.cmake
>+%%DATADIR%%/Modules/Compiler/Tasking-CXX.cmake
>+%%DATADIR%%/Modules/Compiler/Tasking-DetermineCompiler.cmake
>+%%DATADIR%%/Modules/Compiler/Tasking-FindBinUtils.cmake
>+%%DATADIR%%/Modules/Compiler/Tasking.cmake
> %%DATADIR%%/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake
> %%DATADIR%%/Modules/Compiler/TinyCC-C.cmake
> %%DATADIR%%/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake
>@@ -2475,6 +2520,7 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Modules/FindOpenCL.cmake
> %%DATADIR%%/Modules/FindOpenGL.cmake
> %%DATADIR%%/Modules/FindOpenMP.cmake
>+%%DATADIR%%/Modules/FindOpenSP.cmake
> %%DATADIR%%/Modules/FindOpenSSL.cmake
> %%DATADIR%%/Modules/FindOpenSceneGraph.cmake
> %%DATADIR%%/Modules/FindOpenThreads.cmake
>@@ -2504,6 +2550,7 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Modules/FindRTI.cmake
> %%DATADIR%%/Modules/FindRuby.cmake
> %%DATADIR%%/Modules/FindSDL.cmake
>+%%DATADIR%%/Modules/FindSDL_gfx.cmake
> %%DATADIR%%/Modules/FindSDL_image.cmake
> %%DATADIR%%/Modules/FindSDL_mixer.cmake
> %%DATADIR%%/Modules/FindSDL_net.cmake
>@@ -2789,7 +2836,6 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Modules/Platform/Darwin.cmake
> %%DATADIR%%/Modules/Platform/DragonFly.cmake
> %%DATADIR%%/Modules/Platform/Euros.cmake
>-%%DATADIR%%/Modules/Platform/FreeBSD-CXX.cmake
> %%DATADIR%%/Modules/Platform/FreeBSD-Determine-CXX.cmake
> %%DATADIR%%/Modules/Platform/FreeBSD.cmake
> %%DATADIR%%/Modules/Platform/Fuchsia.cmake
>@@ -2891,6 +2937,14 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Modules/Platform/RISCos.cmake
> %%DATADIR%%/Modules/Platform/SCO_SV.cmake
> %%DATADIR%%/Modules/Platform/SINIX.cmake
>+%%DATADIR%%/Modules/Platform/SerenityOS-Clang-ASM.cmake
>+%%DATADIR%%/Modules/Platform/SerenityOS-Clang-C.cmake
>+%%DATADIR%%/Modules/Platform/SerenityOS-Clang-CXX.cmake
>+%%DATADIR%%/Modules/Platform/SerenityOS-GNU-ASM.cmake
>+%%DATADIR%%/Modules/Platform/SerenityOS-GNU-C.cmake
>+%%DATADIR%%/Modules/Platform/SerenityOS-GNU-CXX.cmake
>+%%DATADIR%%/Modules/Platform/SerenityOS-GNU.cmake
>+%%DATADIR%%/Modules/Platform/SerenityOS.cmake
> %%DATADIR%%/Modules/Platform/SunOS-Clang-C.cmake
> %%DATADIR%%/Modules/Platform/SunOS-Clang-CXX.cmake
> %%DATADIR%%/Modules/Platform/SunOS-GNU-C.cmake
>@@ -2913,6 +2967,7 @@ share/bash-completion/completions/ctest
> %%DATADIR%%/Modules/Platform/Windows-Clang-ASM.cmake
> %%DATADIR%%/Modules/Platform/Windows-Clang-C.cmake
> %%DATADIR%%/Modules/Platform/Windows-Clang-CXX.cmake
>+%%DATADIR%%/Modules/Platform/Windows-Clang-HIP.cmake
> %%DATADIR%%/Modules/Platform/Windows-Clang.cmake
> %%DATADIR%%/Modules/Platform/Windows-Determine-CXX.cmake
> %%DATADIR%%/Modules/Platform/Windows-Embarcadero-C.cmake
>@@ -3094,6 +3149,10 @@ share/bash-completion/completions/ctest
> %%PORTDOCS%%%%DOCSDIR%%/cmcurl/COPYING
> %%PORTDOCS%%%%DOCSDIR%%/cmnghttp2/COPYING
> %%PORTDOCS%%%%DOCSDIR%%/cmsys/Copyright.txt
>+share/aclocal/cmake.m4
>+share/bash-completion/completions/cmake
>+share/bash-completion/completions/cpack
>+share/bash-completion/completions/ctest
> share/emacs/site-lisp/cmake-mode.el
> share/vim/vimfiles/indent/cmake.vim
> share/vim/vimfiles/syntax/cmake.vim
>diff --git net-im/telegram-desktop/Makefile net-im/telegram-desktop/Makefile
>index 2bd256476561..eff6531f156a 100644
>--- net-im/telegram-desktop/Makefile
>+++ net-im/telegram-desktop/Makefile
>@@ -72,7 +72,8 @@ USE_GL=		gl
> USE_GNOME=	glib20 glibmm26
> USE_XORG=	x11 xcb xcomposite xdamage xext xfixes xrandr xrender xtst
> 
>-CMAKE_ARGS=	-DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH}
>+CMAKE_ARGS=	-DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH} \
>+		-DLINUX=1
> CMAKE_ON=	DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS \
> 		DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
> CMAKE_OFF=	DESKTOP_APP_USE_PACKAGED_FONTS
>diff --git net-im/telegram-desktop/files/patch-CMakeLists.txt net-im/telegram-desktop/files/patch-CMakeLists.txt
>new file mode 100644
>index 000000000000..6a00ae221e94
>--- /dev/null
>+++ net-im/telegram-desktop/files/patch-CMakeLists.txt
>@@ -0,0 +1,10 @@
>+--- CMakeLists.txt.orig	2022-12-25 22:21:34.522573000 +0100
>++++ CMakeLists.txt	2022-12-25 22:21:42.197358000 +0100
>+@@ -31,6 +31,7 @@
>+     HOMEPAGE_URL "https://desktop.telegram.org"
>+ )
>+ set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Telegram)
>++set(LINUX 1)
>+ 
>+ get_filename_component(third_party_loc "Telegram/ThirdParty" REALPATH)
>+ get_filename_component(submodules_loc "Telegram" REALPATH)
>diff --git sysutils/lizardfs/files/patch-cmake_CheckIncludes.cmake sysutils/lizardfs/files/patch-cmake_CheckIncludes.cmake
>new file mode 100644
>index 000000000000..0dfe41ad59fb
>--- /dev/null
>+++ sysutils/lizardfs/files/patch-cmake_CheckIncludes.cmake
>@@ -0,0 +1,13 @@
>+--- cmake/CheckIncludes.cmake.orig	2022-12-24 21:43:32 UTC
>++++ cmake/CheckIncludes.cmake
>+@@ -3,7 +3,9 @@ include(CheckIncludeFiles)
>+ function(check_includes INCLUDES)
>+   set(INCLUDE_MISSING FALSE)
>+   foreach(INCLUDE_FILE ${INCLUDES})
>+-    check_include_files(${INCLUDE_FILE} ${INCLUDE_FILE}_FOUND)
>++    string(MAKE_C_IDENTIFIER "${INCLUDE_FILE}" c_include)
>++    check_include_files(${INCLUDE_FILE} ${c_include}_FOUND)
>++    set(${INCLUDE_FILE}_FOUND ${${c_include}_FOUND})
>+     if(NOT ${INCLUDE_FILE}_FOUND)
>+       set(INCLUDE_MISSING TRUE)
>+       set(MISSING_INCLUDES ${MISSING_INCLUDES} ${INCLUDE_FILE})

Actions: View | Diff

Attachments on bug 267872: 238188 | 239184