skip using the CMakeLists.txt in mk/macos, add fontconfig to osx deps (#287)

I'm not so sure the CMakeLists.txt in mk/osx is needed. When I disable it, travis is still able to complete the build.

I also added fontconfig to the osx dependencies so cmake could actually find it.

ping #263 and @oxenran
This commit is contained in:
Andy Alt
2018-10-17 16:34:51 -05:00
committed by GitHub
parent dddf69bc3d
commit caf5563b01
5 changed files with 7 additions and 5 deletions

View File

@@ -81,6 +81,7 @@ IF(BUILD_MODEL_VIEWER OR BUILD_MAP_EDITOR OR BUILD_ZETAGLEST)
ENDIF()
IF(WANT_USE_OpenSSL)
INCLUDE_DIRECTORIES(/usr/local/opt/openssl)
set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)
include(FindOpenSSL)
IF(OPENSSL_FOUND)