svn commit: r1920696 - /apr/apr/trunk/CMakeLists.txt

Author: ivan
Date: Sun Sep 15 18:21:14 2024
New Revision: 1920696

URL: http://svn.apache.org/viewvc?rev=1920696&view=rev
Log:
CMake: Search only for packages needed for enabled features.

Modified:
    apr/apr/trunk/CMakeLists.txt

Modified: apr/apr/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CMakeLists.txt?rev=1920696&r1=1920695&r2=1920696&view=diff
==============================================================================
--- apr/apr/trunk/CMakeLists.txt (original)
+++ apr/apr/trunk/CMakeLists.txt Sun Sep 15 18:21:14 2024
@@ -39,11 +39,6 @@ ENDIF()
 
 OPTION(APR_MINIMAL_BUILD    "Create minimal APR build"       OFF)
 IF(NOT APR_MINIMAL_BUILD)
-    FIND_PACKAGE(EXPAT)
-    FIND_PACKAGE(LibXml2)
-    FIND_PACKAGE(OpenSSL)
-    FIND_PACKAGE(Iconv)
-    FIND_PACKAGE(SQLite3)
     OPTION(APU_HAVE_ODBC     "Build ODBC DBD driver"         ON)
 ELSE()
     OPTION(APU_HAVE_ODBC     "Build ODBC DBD driver"         OFF)
@@ -51,20 +46,9 @@ ENDIF()
 
 SET(apr_libname libapr-2)
 
-IF(NOT APU_USE_EXPAT AND NOT APU_USE_LIBXML2 AND NOT APU_USE_XMLLITE)
-  OPTION(APU_USE_EXPAT      "Use Expat"                    OFF)
-  OPTION(APU_USE_LIBXML2    "Use LibXml2"                  OFF)
-  OPTION(APU_USE_XMLLITE    "Use XmlLite"                  ON)
-ENDIF()
-
-IF(APU_USE_EXPAT AND NOT EXPAT_FOUND)
-  MESSAGE(FATAL_ERROR "Expat not found")
-ENDIF()
-
-IF(APU_USE_LIBXML2 AND NOT LIBXML2_FOUND)
-  MESSAGE(FATAL_ERROR "LibXml2 not found")
-ENDIF()
-
+OPTION(APU_USE_EXPAT        "Use Expat"                    OFF)
+OPTION(APU_USE_LIBXML2      "Use LibXml2"                  OFF)
+OPTION(APU_USE_XMLLITE      "Use XmlLite"                  ON)
 OPTION(APR_INSTALL_PRIVATE_H  "Install selected private .h files (for httpd)"  OFF)
 OPTION(APU_HAVE_SQLITE3     "Build SQLite3 DBD driver"     OFF)
 OPTION(APU_HAVE_CRYPTO      "Crypto support"               OFF)
@@ -92,19 +76,23 @@ IF(APR_MODULAR_DSO AND NOT BUILD_SHARED_
 ENDIF()
 
 IF(APU_HAVE_CRYPTO)
-IF(NOT OPENSSL_FOUND)
-  MESSAGE(FATAL_ERROR "OpenSSL is the only supported crypto implementation, and it wasn't found!")
+  FIND_PACKAGE(OpenSSL REQUIRED)
 ENDIF()
+
+IF(APU_USE_EXPAT)
+  FIND_PACKAGE(EXPAT REQUIRED)
 ENDIF()
-IF(APU_HAVE_ICONV)
-IF(NOT Iconv_FOUND)
-  MESSAGE(FATAL_ERROR "Libiconv wasn't found!")
+
+IF(APU_USE_LIBXML2)
+  FIND_PACKAGE(LibXml2 REQUIRED)
 ENDIF()
+
+IF(APU_HAVE_ICONV)
+  FIND_PACKAGE(Iconv REQUIRED)
 ENDIF()
+
 IF(APU_HAVE_SQLITE3)
-IF(NOT SQLite3_FOUND)
-  MESSAGE(FATAL_ERROR "SQLite3 wasn't found!")
-ENDIF()
+  FIND_PACKAGE(SQLite3 REQUIRED)
 ENDIF()
 
 IF(APR_POOL_DEBUG)