Clean build config.

This commit is contained in:
Jean-Philip Desjardins 2018-12-04 17:37:55 -05:00
parent 75042ab29a
commit df97ea71a6
2 changed files with 3 additions and 7 deletions

View file

@ -83,7 +83,7 @@ travis_script()
cmake --build .
elif [ "$TARGET_OS" = "OSX" ]; then
export CMAKE_PREFIX_PATH="$(brew --prefix qt5)"
cmake .. -G"$BUILD_TYPE" -DUSE_QT=ON
cmake .. -G"$BUILD_TYPE"
cmake --build . --config Release
$(brew --prefix qt5)/bin/macdeployqt Source/ui_unix/Release/Play.app
appdmg ../installer_macosx/spec.json Play.dmg

View file

@ -26,15 +26,11 @@ set(PROJECT_LIBS)
include(PrecompiledHeader)
if(BUILD_PLAY)
if(TARGET_PLATFORM_UNIX OR USE_QT)
if(TARGET_PLATFORM_UNIX OR TARGET_PLATFORM_MACOS OR USE_QT)
add_subdirectory(Source/ui_qt/)
endif(TARGET_PLATFORM_UNIX OR USE_QT)
endif(TARGET_PLATFORM_UNIX OR TARGET_PLATFORM_MACOS OR USE_QT)
if(NOT USE_QT)
if(TARGET_PLATFORM_MACOS)
add_subdirectory(Source/ui_macosx/)
endif(TARGET_PLATFORM_MACOS)
if(TARGET_PLATFORM_IOS)
add_subdirectory(Source/ui_ios/)
endif(TARGET_PLATFORM_IOS)