diff options
| author | John Vogel <jvogel4@stny.rr.com> | 2024-07-13 04:45:00 -0400 |
|---|---|---|
| committer | John Vogel <jvogel4@stny.rr.com> | 2024-07-13 04:45:00 -0400 |
| commit | 61c554300f0078b71e9487cddc8d1f144ecbc743 (patch) | |
| tree | 949d0a20145cfef08d663cbcc64dcd1f00b35301 /xdiff/0001-flesh-out-CMakeLists.txt-for-managable-build-install.patch | |
| parent | e641fea471c85d267a22ac9ee431d07e4a5c8701 (diff) | |
| download | my-aports-61c554300f0078b71e9487cddc8d1f144ecbc743.tar.gz | |
local/xdiff: upgrade to 2.45.0
Revise cmake patch for simplified build.
Fix up subpackages.
Diffstat (limited to 'xdiff/0001-flesh-out-CMakeLists.txt-for-managable-build-install.patch')
| -rw-r--r-- | xdiff/0001-flesh-out-CMakeLists.txt-for-managable-build-install.patch | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/xdiff/0001-flesh-out-CMakeLists.txt-for-managable-build-install.patch b/xdiff/0001-flesh-out-CMakeLists.txt-for-managable-build-install.patch index ef85ab9..44088bf 100644 --- a/xdiff/0001-flesh-out-CMakeLists.txt-for-managable-build-install.patch +++ b/xdiff/0001-flesh-out-CMakeLists.txt-for-managable-build-install.patch @@ -1,17 +1,17 @@ -From f9e099d60b7c427b69298b0e04b71d6128188397 Mon Sep 17 00:00:00 2001 +From 8e9a7001d70bc35322dc3326e252a3407d762ef2 Mon Sep 17 00:00:00 2001 From: John Vogel <jvogel4@stny.rr.com> -Date: Sat, 9 Sep 2023 21:23:42 -0400 -Subject: [PATCH 1/2] flesh out CMakeLists.txt for managable build/install +Date: Sat, 13 Jul 2024 04:13:24 -0400 +Subject: [PATCH] flesh out CMakeLists.txt for managable build/install --- - CMakeLists.txt | 44 ++++++++++++++++++++++++++++++++++++++++---- - 1 file changed, 40 insertions(+), 4 deletions(-) + CMakeLists.txt | 46 ++++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 766b546..6e7e610 100644 +index 49a0d2c..6d01a30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,8 +1,44 @@ +@@ -1,8 +1,46 @@ cmake_minimum_required(VERSION 3.5.1) -project(xdiff VERSION "0.1" LANGUAGES C) @@ -20,10 +20,10 @@ index 766b546..6e7e610 100644 -file(GLOB SRC "*.c" "*.h") -list(SORT SRC) +set(XDIFF_MAJOR_VERSION 2) -+set(XDIFF_MINOR_VERSION 40) -+set(XDIFF_PATCH_VERSION 1) ++set(XDIFF_MINOR_VERSION 45) ++set(XDIFF_PATCH_VERSION 0) --add_library(xdiff OBJECT ${SRC}) +-add_library(xdiff STATIC ${SRC}) +set(XDIFF_VERSION + ${XDIFF_MAJOR_VERSION}.${XDIFF_MINOR_VERSION}.${XDIFF_PATCH_VERSION}) + @@ -38,8 +38,7 @@ index 766b546..6e7e610 100644 + +add_library(xdiff ${xdiff_LIB_SRCS}) + -+option(BUILD_SHARED_LIBS "build a shared library" ON) -+option(BUILD_STATIC_LIBS "build a static library" OFF) ++option(BUILD_SHARED_LIBS "build a shared library" OFF) + +install(FILES + git-xdiff.h @@ -51,6 +50,7 @@ index 766b546..6e7e610 100644 + xprepare.h + xtypes.h + xutils.h ++ COMPONENT files + DESTINATION include/xdiff) + +set_target_properties(xdiff PROPERTIES @@ -58,8 +58,10 @@ index 766b546..6e7e610 100644 + SOVERSION ${XDIFF_MAJOR_VERSION}.${XDIFF_MINOR_VERSION}) + +install(TARGETS xdiff ${INSTALL_TARGETS_DEFAULT_ARGS} ++ COMPONENT libs + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ) -- -2.42.0 +2.45.2 |