Skip to content

Commit f724b61

Browse files
authored
Declutter one cmake file (#662)
1 parent acb4b56 commit f724b61

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ endif()
579579

580580
# Output files
581581

582-
configure_file(config-cmake.h.in ${PROJECT_BINARY_DIR}/config.h @ONLY)
582+
configure_file(src/config-cmake.h.in ${PROJECT_BINARY_DIR}/config.h @ONLY)
583583

584584
# Parse version numbers and date out of configure.ac
585585

Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -972,7 +972,7 @@ EXTRA_DIST += \
972972
cmake/FindReadline.cmake \
973973
cmake/pcre2-config-version.cmake.in \
974974
cmake/pcre2-config.cmake.in \
975-
CMakeLists.txt \
976-
config-cmake.h.in
975+
src/config-cmake.h.in \
976+
CMakeLists.txt
977977

978978
## end Makefile.am

README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -940,8 +940,8 @@ The distribution should contain the files listed below.
940940
cmake/FindReadline.cmake
941941
cmake/pcre2-config-version.cmake.in
942942
cmake/pcre2-config.cmake.in
943+
src/config-cmake.h.in
943944
CMakeLists.txt
944-
config-cmake.h.in
945945

946946
(E) Auxiliary files for building PCRE2 "by hand"
947947

build.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub fn build(b: *std.Build) !void {
1717

1818
const config_header = b.addConfigHeader(
1919
.{
20-
.style = .{ .cmake = b.path("config-cmake.h.in") },
20+
.style = .{ .cmake = b.path("src/config-cmake.h.in") },
2121
.include_path = "config.h",
2222
},
2323
.{

doc/html/README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -940,8 +940,8 @@ The distribution should contain the files listed below.
940940
cmake/FindReadline.cmake
941941
cmake/pcre2-config-version.cmake.in
942942
cmake/pcre2-config.cmake.in
943+
src/config-cmake.h.in
943944
CMakeLists.txt
944-
config-cmake.h.in
945945

946946
(E) Auxiliary files for building PCRE2 "by hand"
947947

maint/PrepareRelease

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ crlf_files=(
246246
)
247247

248248
c_files=(
249-
config-cmake.h.in
249+
src/config-cmake.h.in
250250
src/pcre2.h.in
251251
src/pcre2_auto_possess.c
252252
src/pcre2_chartables.c.dist

maint/manifest-tarball

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ drwxr-xr-x tarball-dir/pcre2-SNAPSHOT/cmake
3030
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/cmake/pcre2-config-version.cmake.in
3131
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/cmake/pcre2-config.cmake.in
3232
-rwxr-xr-x tarball-dir/pcre2-SNAPSHOT/compile
33-
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/config-cmake.h.in
3433
-rwxr-xr-x tarball-dir/pcre2-SNAPSHOT/config.guess
3534
-rwxr-xr-x tarball-dir/pcre2-SNAPSHOT/config.sub
3635
-rwxr-xr-x tarball-dir/pcre2-SNAPSHOT/configure
@@ -298,6 +297,7 @@ drwxr-xr-x tarball-dir/pcre2-SNAPSHOT/m4
298297
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/pcre2-config.in
299298
-rwxr-xr-x tarball-dir/pcre2-SNAPSHOT/perltest.sh
300299
drwxr-xr-x tarball-dir/pcre2-SNAPSHOT/src
300+
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/src/config-cmake.h.in
301301
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/src/config.h.generic
302302
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/src/config.h.in
303303
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/src/pcre2.h.generic
File renamed without changes.

0 commit comments

Comments
 (0)