Add CMake style references.

2 files changed, 21 insertions, 5 deletions

diff --git a/config/openssl.mpb b/config/openssl.mpb
index 8af0fef4..84e466fa 100644
--- a/config/openssl.mpb
+++ b/config/openssl.mpb
@@ -13,8 +13,10 @@ feature(openssl) {
     $(SSL_ROOT)/lib
   }
 
-  includes += $(SSL_INCDIR)
-  libpaths += $(SSL_LIBDIR)
+  specific(!cmake) {
+    includes += $(SSL_INCDIR)
+    libpaths += $(SSL_LIBDIR)
+  }
 
   specific(prop:windows) {
     lit_libs += libeay32 ssleay32
@@ -36,6 +38,15 @@ feature(openssl) {
   specific(prop:microsoft) {
     libpaths += $(SSL_ROOT)/lib/VC
   }
+
+  specific(cmake) {
+    // Undo the else of the !prop:windows above.
+    lit_libs -= ssl crypto
+    includes -= /usr/kerberos/include
+
+    lit_libs += ${OPENSSL_LIBRARIES}
+    includes += ${OPENSSL_INCLUDE_DIR}
+  }
 }
 
 feature(openssl11) {
diff --git a/config/xerces.mpb b/config/xerces.mpb
index 85f7e8aa..464ea345 100644
--- a/config/xerces.mpb
+++ b/config/xerces.mpb
@@ -38,9 +38,6 @@ feature(xerces3) {
     $(XERCESCROOT)/lib
   }
 
-  includes += $(XERCESC_INCDIR)
-  libpaths += $(XERCESC_LIBDIR)
-
   specific(prop:microsoft) {
     xerceslib = xerces-c_3
 
@@ -57,6 +54,14 @@ feature(xerces3) {
     xerceslib = xerces-c
   }
 
+  specific(cmake) {
+    includes += ${XercesC_INCLUDE_DIRS}
+    xerceslib = XercesC::XercesC
+  } else {
+    includes += $(XERCESC_INCDIR)
+    libpaths += $(XERCESC_LIBDIR)
+  }
+
   // We have to use lit_libs here as the library decorator
   // does not necessarily match what MPC uses (particularly for
   // static builds).