Skip to content

Commit ec9f357

Browse files
committed
Adding CMakeLists.txt to EXTRA_DIST
1 parent e43c0d0 commit ec9f357

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

CMakeLists.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@
33

44
cmake_minimum_required(VERSION 3.10)
55

6+
set(VERSION 0.21.5) # must match version.txt
7+
set(VERSION_NUMBER 0x001505) # must match version.txt converted to hexadecimal
8+
69
project(psl
7-
VERSION 0.21.5 # must match version.txt
10+
VERSION ${VERSION}
811
LANGUAGES C
12+
DESCRIPTION "C library to handle the Public Suffix List"
913
)
10-
set(LIBPSL_VERSION_NUMBER 0x001505) # must match version.txt converted to hexadecimal
14+
set(LIBPSL_VERSION_NUMBER ${VERSION_NUMBER})
1115
set(LIBPSL_VERSION_MAJOR ${psl_VERSION_MAJOR})
1216
set(LIBPSL_VERSION_MINOR ${psl_VERSION_MINOR})
1317
set(LIBPSL_VERSION_PATCH ${psl_VERSION_PATCH})
@@ -17,10 +21,7 @@ add_definitions(
1721
-DPACKAGE_VERSION=\"${LIBPSL_VERSION}\"
1822
-DBUILDING_PSL=1
1923
-DPSL_STATIC=1
20-
21-
# ensure that builtin list is enabled even though the client code
22-
# is going to ensure utf8 + lowercase instead of bundling more
23-
# dependencies here (e.g. libidn2, libunistring)
24+
# ensure that builtin list is enabled
2425
-DENABLE_BUILTIN=1
2526
)
2627

Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
2222
pkgconfigdir = $(libdir)/pkgconfig
2323
pkgconfig_DATA = libpsl.pc
2424

25-
EXTRA_DIST = build-aux/config.rpath LICENSE meson.build meson_options.txt
25+
EXTRA_DIST = build-aux/config.rpath CMakeLists.txt LICENSE meson.build meson_options.txt
2626
dist-hook:
2727
mkdir -p $(distdir)/list/tests
2828
cp -p $(PSL_FILE) $(distdir)/list

0 commit comments

Comments
 (0)