revi-archive/xz-archive
1
0
Fork 0
mirror of https://git.tukaani.org/xz.git synced 2024-04-04 12:36:23 +02:00
Code Activity

CMake: Rearrange the PACKAGE_ variables.

Browse source 
The windres workaround now replaces spaces with \x20 so
the package name isn't repeated.

These changes will help with creation of liblzma.pc.
This commit is contained in:
Lasse Collin 2023-09-30 01:13:13 +03:00 committed by Jia Tan
parent 4083c8e950
commit 983f3b458d
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
CMakeLists.txt
View file

@ -59,8 +59,12 @@ include(cmake/tuklib_physmem.cmake)
include(cmake/tuklib_progname.cmake) include(cmake/tuklib_progname.cmake)
include(cmake/tuklib_mbstr.cmake) include(cmake/tuklib_mbstr.cmake)
# Get the package version from version.h into XZ_VERSION variable. set(PACKAGE_NAME "XZ Utils")
file(READ src/liblzma/api/lzma/version.h XZ_VERSION) set(PACKAGE_BUGREPORT "xz@tukaani.org")
set(PACKAGE_URL "https://tukaani.org/xz/")
# Get the package version from version.h into PACKAGE_VERSION variable.
file(READ src/liblzma/api/lzma/version.h PACKAGE_VERSION)
string(REGEX REPLACE string(REGEX REPLACE
"^.*\n\ "^.*\n\
#define LZMA_VERSION_MAJOR ([0-9]+)\n\ #define LZMA_VERSION_MAJOR ([0-9]+)\n\
@ -69,10 +73,10 @@ string(REGEX REPLACE
.*\ .*\
#define LZMA_VERSION_PATCH ([0-9]+)\n\ #define LZMA_VERSION_PATCH ([0-9]+)\n\
.*$" .*$"
"\\1.\\2.\\3" XZ_VERSION "${XZ_VERSION}") "\\1.\\2.\\3" PACKAGE_VERSION "${PACKAGE_VERSION}")
# Among other things, this gives us variables xz_VERSION and xz_VERSION_MAJOR. # Among other things, this gives us variables xz_VERSION and xz_VERSION_MAJOR.
project(xz VERSION "${XZ_VERSION}" LANGUAGES C) project(xz VERSION "${PACKAGE_VERSION}" LANGUAGES C)
# We need a compiler that supports enough C99 or newer (variable-length arrays # We need a compiler that supports enough C99 or newer (variable-length arrays
# aren't needed, those are optional in C17). Setting CMAKE_C_STANDARD here # aren't needed, those are optional in C17). Setting CMAKE_C_STANDARD here
@ -107,22 +111,22 @@ if((MINGW OR CYGWIN OR MSYS) AND (
NOT CMAKE_C_COMPILER_ID STREQUAL "Clang" OR NOT CMAKE_C_COMPILER_ID STREQUAL "Clang" OR
CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "17")) CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "17"))
# Use workarounds with GNU windres and llvm-windres >= 17.0.0. The \x20 # Use workarounds with GNU windres and llvm-windres >= 17.0.0. The \x20
# in PACKAGE_NAME works with gcc and clang too so we don't need to worry # in PACKAGE_NAME_DEFINITION works with gcc and clang too so we don't need
# how to pass different flags to windres and the C compiler. # to worry how to pass different flags to windres and the C compiler.
string(APPEND CMAKE_RC_FLAGS " --use-temp-file") string(APPEND CMAKE_RC_FLAGS " --use-temp-file")
set(PACKAGE_NAME "XZ\\x20Utils") string(REPLACE " " "\\x20" PACKAGE_NAME_DEFINITION "${PACKAGE_NAME}")
else() else()
# Elsewhere a space is safe. This also keeps things compatible with # Elsewhere a space is safe. This also keeps things compatible with
# EBCDIC in case CMake-based build is ever done on such a system. # EBCDIC in case CMake-based build is ever done on such a system.
set(PACKAGE_NAME "XZ Utils") set(PACKAGE_NAME_DEFINITION "${PACKAGE_NAME}")
endif() endif()
# Definitions common to all targets: # Definitions common to all targets:
add_compile_definitions( add_compile_definitions(
# Package info: # Package info:
PACKAGE_NAME="${PACKAGE_NAME}" PACKAGE_NAME="${PACKAGE_NAME_DEFINITION}"
PACKAGE_BUGREPORT="xz@tukaani.org" PACKAGE_BUGREPORT="${PACKAGE_BUGREPORT}"
PACKAGE_URL="https://tukaani.org/xz/" PACKAGE_URL="${PACKAGE_URL}"
# Standard headers and types are available: # Standard headers and types are available:
HAVE_STDBOOL_H HAVE_STDBOOL_H