git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: "Yuyi Wang via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Derrick Stolee <derrickstolee@github.com>,
	Yuyi Wang <Strawberry_Str@hotmail.com>
Subject: [PATCH v2 0/2] Add pcre2 support for cmake build system.
Date: Tue, 24 May 2022 06:38:46 +0000	[thread overview]
Message-ID: <pull.1267.v2.git.git.1653374328.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1267.git.git.1652846305514.gitgitgadget@gmail.com>

Pcre2 is dealt with pkg-config.

Yuyi Wang (2):
  Fix CMakeLists.txt on Linux.
  Add pcre2 support for cmake build system.

 contrib/buildsystems/CMakeLists.txt | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)


base-commit: 277cf0bc36094f6dc4297d8c9cef79df045b735d
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1267%2FBerrysoft%2Fcmake%2Fpcre2-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1267/Berrysoft/cmake/pcre2-v2
Pull-Request: https://github.com/git/git/pull/1267

Range-diff vs v1:

 -:  ----------- > 1:  29cb31e5c50 Fix CMakeLists.txt on Linux.
 1:  679e5dd46d0 ! 2:  b828585b205 Add pcre2 support for cmake build system.
     @@ Commit message
      
          This commit fixes one of the TODOs listed in the CMakeLists.txt.
      
     -    There's also some small fix to ensure it builds successfully.
     +    As pcre2 doesn't provide cmake find module, we find it with pkgconf.
     +    This patch also works with vcpkg on Windows, with pkgconf and pcre2
     +    installed.
     +
     +    Pkgconf and pcre2 is detected automatically just like curl, expat
     +    and iconv. The output of CMake indicates whether pcre2 is found.
      
          Signed-off-by: Yuyi Wang <Strawberry_Str@hotmail.com>
      
       ## contrib/buildsystems/CMakeLists.txt ##
     -@@ contrib/buildsystems/CMakeLists.txt: set(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/../..)
     - 
     - option(USE_VCPKG "Whether or not to use vcpkg for obtaining dependencies.  Only applicable to Windows platforms" ON)
     - if(NOT WIN32)
     --	set(USE_VCPKG OFF CACHE BOOL FORCE)
     -+	set(USE_VCPKG OFF CACHE BOOL "" FORCE)
     - endif()
     - 
     - if(NOT DEFINED CMAKE_EXPORT_COMPILE_COMMANDS)
      @@ contrib/buildsystems/CMakeLists.txt: project(git
       
       #TODO gitk git-gui gitweb
     @@ contrib/buildsystems/CMakeLists.txt: endif()
       
       
       if(WIN32 AND NOT MSVC)#not required for visual studio builds
     -@@ contrib/buildsystems/CMakeLists.txt: if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     - 
     - elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     - 	add_compile_definitions(PROCFS_EXECUTABLE_PATH="/proc/self/exe" HAVE_DEV_TTY )
     --	list(APPEND compat_SOURCES unix-socket.c unix-stream-server.c)
     -+	list(APPEND compat_SOURCES unix-socket.c unix-stream-server.c compat/linux/procinfo.c)
     - endif()
     - 
     - if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
      @@ contrib/buildsystems/CMakeLists.txt: endif()
       if(Iconv_FOUND)
       	target_link_libraries(common-main ${Iconv_LIBRARIES})
       endif()
      +if(PCRE2_FOUND)
      +	target_link_libraries(common-main ${PCRE2_LIBRARIES})
     ++	target_link_directories(common-main PUBLIC ${PCRE2_LIBRARY_DIRS})
      +endif()
       if(WIN32)
       	target_link_libraries(common-main ws2_32 ntdll ${CMAKE_BINARY_DIR}/git.res)

-- 
gitgitgadget

  parent reply	other threads:[~2022-05-24  6:39 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-18  3:58 [PATCH] Add pcre2 support for cmake build system Yuyi Wang via GitGitGadget
2022-05-18 22:02 ` Junio C Hamano
2022-05-19 16:18   ` Yuyi Wang
2022-05-23 18:35     ` Derrick Stolee
2022-05-23 18:36   ` Derrick Stolee
2022-05-24  6:38 ` Yuyi Wang via GitGitGadget [this message]
2022-05-24  6:38   ` [PATCH v2 1/2] Fix CMakeLists.txt on Linux Yuyi Wang via GitGitGadget
2022-05-24 23:04     ` Junio C Hamano
2022-05-24  6:38   ` [PATCH v2 2/2] Add pcre2 support for cmake build system Yuyi Wang via GitGitGadget

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=pull.1267.v2.git.git.1653374328.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=Strawberry_Str@hotmail.com \
    --cc=derrickstolee@github.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).