diff options
| author | ocielliottc <elliottc@objectcomputing.com> | 2023-01-03 07:37:33 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-03 07:37:33 -0600 |
| commit | 60b0c90efa801c758911bdc4c7949db6809eb3f4 (patch) | |
| tree | 5f67f61f50f045f374f8e0ab4067888da95b92af /config/openssl.mpb | |
| parent | 5aad93c4292b7aa33395dd2bb96c5599c73bdf5a (diff) | |
| parent | 26e3b92f9ed15c69f17baca125444b886b874055 (diff) | |
| download | MPC-60b0c90efa801c758911bdc4c7949db6809eb3f4.tar.gz | |
Merge pull request #164 from DOCGroup/elliottc/cmake-support
Elliottc/cmake support
Diffstat (limited to 'config/openssl.mpb')
| -rw-r--r-- | config/openssl.mpb | 15 |
1 files changed, 13 insertions, 2 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) { |