From 7304ee24b2957a331c87017162854a7ac46c6b90 Mon Sep 17 00:00:00 2001
From: Fs <Fsu0413@vip.qq.com>
Date: Sat, 30 Dec 2023 09:42:22 +0800
Subject: [PATCH] add exporters directory

Signed-off-by: Fs <Fsu0413@vip.qq.com>
---
 CMakeLists.txt                                  |  1 +
 apps/CMakeLists.txt                             |  5 -----
 crypto/CMakeLists.txt                           |  6 ------
 exporters/CMakeLists.txt                        | 17 +++++++++++++++++
 .../pkg-config}/libcrypto.pc.cmake.in           |  0
 .../pkg-config}/libssl.pc.cmake.in              |  0
 .../pkg-config}/openssl.pc.cmake.in             |  0
 ssl/CMakeLists.txt                              |  5 -----
 8 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 exporters/CMakeLists.txt
 rename {crypto => exporters/pkg-config}/libcrypto.pc.cmake.in (100%)
 rename {ssl => exporters/pkg-config}/libssl.pc.cmake.in (100%)
 rename {apps => exporters/pkg-config}/openssl.pc.cmake.in (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b5c41b..cab5069 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -609,6 +609,7 @@ if (OPENSSL_AUTOALGINIT AND OPENSSL_STDIO)
 endif()
 add_subdirectory(engines)
 add_subdirectory(tools)
+add_subdirectory(exporters)
 
 # OpenSSL 1.1 redesigns the whole test program.
 # It currently depends on configdata.pm (It did "eval" it instead of "use" it. See "util/perl/OpenSSL/Test/Utils.pm", line 87) which we never generate in CMake.
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index 5ccc6f0..67104bc 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -347,11 +347,6 @@ install(FILES ${CMAKE_SOURCE_DIR}/openssl/apps/ct_log_list.cnf
     RENAME ct_log_list.cnf.dist
 )
 
-configure_file(openssl.pc.cmake.in openssl.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openssl.pc
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-)
-
 #if (BUILD_TESTING)
 #    if ( ( WIN32 OR CYGWIN ) AND BUILD_SHARED_LIBS )
 #        get_target_property(CRYPTO_RUNTIME_OUTPUT_NAME crypto RUNTIME_OUTPUT_NAME)
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 084d979..0097e70 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -823,9 +823,3 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/openssl/include/openssl
     REGEX "^.+\\.in$" EXCLUDE
     REGEX "^(.*[/\\])?__DECC_INCLUDE.+$" EXCLUDE
 )
-
-# issue: can't specify zlib path, especially for the condition that zlib is found by CMake but can't be found by pkgconfig
-configure_file(libcrypto.pc.cmake.in libcrypto.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcrypto.pc
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-)
diff --git a/exporters/CMakeLists.txt b/exporters/CMakeLists.txt
new file mode 100644
index 0000000..b81ff69
--- /dev/null
+++ b/exporters/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+
+# issue: can't specify zlib path, especially for the condition that zlib is found by CMake but can't be found by pkgconfig
+configure_file(pkg-config/libcrypto.pc.cmake.in libcrypto.pc @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcrypto.pc
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+)
+
+configure_file(pkg-config/libssl.pc.cmake.in libssl.pc @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libssl.pc
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+)
+
+configure_file(pkg-config/openssl.pc.cmake.in openssl.pc @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openssl.pc
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+)
diff --git a/crypto/libcrypto.pc.cmake.in b/exporters/pkg-config/libcrypto.pc.cmake.in
similarity index 100%
rename from crypto/libcrypto.pc.cmake.in
rename to exporters/pkg-config/libcrypto.pc.cmake.in
diff --git a/ssl/libssl.pc.cmake.in b/exporters/pkg-config/libssl.pc.cmake.in
similarity index 100%
rename from ssl/libssl.pc.cmake.in
rename to exporters/pkg-config/libssl.pc.cmake.in
diff --git a/apps/openssl.pc.cmake.in b/exporters/pkg-config/openssl.pc.cmake.in
similarity index 100%
rename from apps/openssl.pc.cmake.in
rename to exporters/pkg-config/openssl.pc.cmake.in
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index a84eb4a..784f578 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -144,8 +144,3 @@ install(TARGETS ssl
     LIBRARY
     ARCHIVE
 )
-
-configure_file(libssl.pc.cmake.in libssl.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libssl.pc
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-)