add exporters directory

Signed-off-by: Fs <[email protected]>
Fsu0413 · Dec 30, 2023 · 6adaa9c · 6adaa9c
1 parent f959df8
commit 6adaa9c
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -384,6 +384,7 @@ add_subdirectory(ssl)
 add_subdirectory(apps)
 add_subdirectory(engines)
 add_subdirectory(tools)
+add_subdirectory(exporters)
 #if (BUILD_TESTING)
 #    add_subdirectory(test)
 #endif()

diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
@@ -102,11 +102,6 @@ install(FILES ${CMAKE_SOURCE_DIR}/openssl/apps/openssl.cnf
     DESTINATION ${OPENSSL_OPENSSLDIR}
 )
 
-configure_file(openssl.pc.cmake.in openssl.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openssl.pc
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-)
-
 if (NOT WIN32)
     configure_file(${CMAKE_SOURCE_DIR}/openssl/apps/CA.sh CA.sh COPYONLY)
 endif()

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
@@ -706,11 +706,6 @@ install(DIRECTORY ${CMAKE_BINARY_DIR}/include/openssl
     TYPE INCLUDE
 )
 
-# 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
-)
 
 #if (BUILD_TESTING)
 #    foreach (_DIRECTORY IN LISTS LIBCRYPTO_DIRECTORIES)

diff --git a/exporters/CMakeLists.txt 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 → exporters/pkg-config/libcrypto.pc.cmake.in b/crypto/libcrypto.pc.cmake.in → exporters/pkg-config/libcrypto.pc.cmake.in
diff --git a/ssl/libssl.pc.cmake.in → exporters/pkg-config/libssl.pc.cmake.in b/ssl/libssl.pc.cmake.in → exporters/pkg-config/libssl.pc.cmake.in
diff --git a/apps/openssl.pc.cmake.in → exporters/pkg-config/openssl.pc.cmake.in b/apps/openssl.pc.cmake.in → exporters/pkg-config/openssl.pc.cmake.in
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
@@ -111,11 +111,6 @@ install(TARGETS ssl
     ARCHIVE
 )
 
-configure_file(libssl.pc.cmake.in libssl.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libssl.pc
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-)
-
 #if (BUILD_TESTING)
 #    if (WIN32 AND BUILD_SHARED_LIBS)
 #        add_custom_command(OUTPUT "${CMAKE_BINARY_DIR}/ssl/libeay32.dll"