66 lines
2.2 KiB
Diff
66 lines
2.2 KiB
Diff
|
diff -ruN mpich/modules/json-c/CMakeLists.txt mpich-4.0.3/modules/json-c/CMakeLists.txt
|
||
|
|
--- mpich/modules/json-c/CMakeLists.txt 2023-01-18 10:35:56.712610706 +0800
|
||
|
|
+++ mpich-4.0.3/modules/json-c/CMakeLists.txt 2023-01-18 10:39:25.377219492 +0800
|
||
|
|
@@ -30,7 +30,6 @@
|
||
|
|
if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING AND
|
||
|
|
(NOT MSVC OR NOT (MSVC_VERSION LESS 1800)) # Tests need at least VS2013
|
||
|
|
)
|
||
|
|
-add_subdirectory(tests)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
# Set some packaging variables.
|
||
|
|
diff -ruN mpich/modules/json-c/configure.ac mpich-4.0.3/modules/json-c/configure.ac
|
||
|
|
--- mpich/modules/json-c/configure.ac 2023-01-18 10:35:56.723610563 +0800
|
||
|
|
+++ mpich-4.0.3/modules/json-c/configure.ac 2023-01-18 10:39:29.171175850 +0800
|
||
|
|
@@ -215,7 +215,6 @@
|
||
|
|
AC_CONFIG_FILES([
|
||
|
|
Makefile
|
||
|
|
json-c.pc
|
||
|
|
-tests/Makefile
|
||
|
|
json-c-uninstalled.pc
|
||
|
|
])
|
||
|
|
|
||
|
|
diff -ruN mpich/modules/json-c/Makefile.am mpich-4.0.3/modules/json-c/Makefile.am
|
||
|
|
--- mpich/modules/json-c/Makefile.am 2023-01-18 10:35:56.723610563 +0800
|
||
|
|
+++ mpich-4.0.3/modules/json-c/Makefile.am 2023-01-18 10:39:34.581113611 +0800
|
||
|
|
@@ -10,7 +10,7 @@
|
||
|
|
chmod -R u+w "$(distdir)/doc"
|
||
|
|
cd "$(distdir)" && doxygen
|
||
|
|
|
||
|
|
-SUBDIRS = . tests
|
||
|
|
+SUBDIRS = .
|
||
|
|
|
||
|
|
if EMBEDDED_BUILD
|
||
|
|
noinst_LTLIBRARIES = libjson-c.la
|
||
|
|
@@ -98,8 +98,7 @@
|
||
|
|
install-sh \
|
||
|
|
ltmain.sh \
|
||
|
|
missing \
|
||
|
|
- test-driver \
|
||
|
|
- tests/Makefile.in
|
||
|
|
+ test-driver
|
||
|
|
JSON_CLEANFILES+= \
|
||
|
|
libtool \
|
||
|
|
stamp-h1 \
|
||
|
|
diff -ruN mpich/modules/json-c/Makefile.in mpich-4.0.3/modules/json-c/Makefile.in
|
||
|
|
--- mpich/modules/json-c/Makefile.in 2023-01-18 10:35:56.723610563 +0800
|
||
|
|
+++ mpich-4.0.3/modules/json-c/Makefile.in 2023-01-18 10:39:35.348104790 +0800
|
||
|
|
@@ -416,7 +416,7 @@
|
||
|
|
ACLOCAL_AMFLAGS = -I autoconf-archive/m4
|
||
|
|
EXTRA_DIST = README.md README.html config.h.win32 Doxyfile \
|
||
|
|
issues_closed_for_0.13.md
|
||
|
|
-SUBDIRS = . tests
|
||
|
|
+SUBDIRS = .
|
||
|
|
@EMBEDDED_BUILD_TRUE@noinst_LTLIBRARIES = libjson-c.la
|
||
|
|
@EMBEDDED_BUILD_FALSE@lib_LTLIBRARIES = libjson-c.la
|
||
|
|
|
||
|
|
@@ -471,7 +471,7 @@
|
||
|
|
json_config.h
|
||
|
|
JSON_CLEANFILES = Makefile.in aclocal.m4 autom4te.cache/ compile \
|
||
|
|
config.guess config.h.in config.sub configure depcomp \
|
||
|
|
- install-sh ltmain.sh missing test-driver tests/Makefile.in \
|
||
|
|
+ install-sh ltmain.sh missing test-driver \
|
||
|
|
libtool stamp-h1 stamp-h2
|
||
|
|
ANDROID_CFLAGS = -I$(top_srcdir) -DHAVE_CONFIG_H
|
||
|
|
all: config.h json_config.h
|