From 465e7186374b0d0d1fae9c1ecfca13b2d59e2d6d Mon Sep 17 00:00:00 2001 From: filux Date: Mon, 26 Oct 2015 21:19:31 +0100 Subject: [PATCH] and one more fix for mac --- mk/macosx/build-mg.sh | 2 +- source/g3d_viewer/CMakeLists.txt | 2 +- source/glest_map_editor/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mk/macosx/build-mg.sh b/mk/macosx/build-mg.sh index 816fd0a1b..6a228aa40 100755 --- a/mk/macosx/build-mg.sh +++ b/mk/macosx/build-mg.sh @@ -141,7 +141,7 @@ echo " [ $distribution ] [ $release ] [ $architecture ] [ $xcode_ver ]" case $release in *) if [ "$WANT_STATIC_LIBS" = "-DWANT_STATIC_LIBS=ON" ]; then echo 'Turning ON dynamic PNG ...' - EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DSTATIC_PNG=OFF -DWANT_USE_VLC=OFF" + EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DSTATIC_PNG=OFF -DWANT_USE_VLC=OFF -DWANT_USE_OpenSSL=OFF" fi;; esac case $xcode_ver in diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt index 26335428f..5b9cc4457 100644 --- a/source/g3d_viewer/CMakeLists.txt +++ b/source/g3d_viewer/CMakeLists.txt @@ -185,7 +185,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER) ${TARGET_NAME} DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH}) - IF(EXISTS ${HELP2MAN} AND EXISTS ${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}) + IF(EXISTS ${HELP2MAN} AND NOT APPLE) MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${MEGAGLEST_MANPAGE_INSTALL_PATH}]") # Installation of the program manpage file diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt index 4cb130468..eb019348f 100644 --- a/source/glest_map_editor/CMakeLists.txt +++ b/source/glest_map_editor/CMakeLists.txt @@ -178,7 +178,7 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR) ${TARGET_NAME} DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH}) - IF(EXISTS ${HELP2MAN} AND EXISTS ${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}) + IF(EXISTS ${HELP2MAN} AND NOT APPLE) MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${MEGAGLEST_MANPAGE_INSTALL_PATH}]") # Installation of the program manpage file