diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 3b330304f5..c4210a2f74 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -54,6 +54,7 @@ jobs: run: | echo ::set-output name=github_sha_short::`echo $GIT_COMMIT | cut -c1-7` echo "JOB_NAME=build (${{matrix.os}}, ${{matrix.build_type}})" >> $GITHUB_ENV + echo "APP_TARGET_NAME=$APP_NAME" >> $GITHUB_ENV # Linux build variables if [[ "${{ matrix.os }}" = "ubuntu-"* ]]; then @@ -75,6 +76,7 @@ jobs: else echo "CMAKE_EXTRA=-DCLIENT_ONLY=1 -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -G Xcode" >> $GITHUB_ENV fi + echo "APP_TARGET_NAME=Vircadia" >> $GITHUB_ENV fi # Windows build variables if [ "${{ matrix.os }}" = "windows-latest" ]; then @@ -142,7 +144,7 @@ jobs: if: matrix.build_type == 'full' || matrix.build_type == 'client' working-directory: ${{runner.workspace}}/build shell: bash - run: cmake --build . --config $BUILD_TYPE --target $APP_NAME $CMAKE_BUILD_EXTRA + run: cmake --build . --config $BUILD_TYPE --target $APP_TARGET_NAME $CMAKE_BUILD_EXTRA - name: Build Domain Server if: matrix.build_type == 'full' working-directory: ${{runner.workspace}}/build diff --git a/CMakeLists.txt b/CMakeLists.txt index f111f482ae..8065244558 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -317,7 +317,11 @@ endif() if (BUILD_CLIENT) add_subdirectory(interface) add_subdirectory(screenshare) - set_target_properties(interface PROPERTIES FOLDER "Apps") + if (APPLE) + set_target_properties(Vircadia PROPERTIES FOLDER "Apps") + else() + set_target_properties(interface PROPERTIES FOLDER "Apps") + endif() option(USE_SIXENSE "Build Interface with sixense library/plugin" OFF) endif() diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake index 7645cb26ef..abe93275f6 100644 --- a/cmake/macros/SetPackagingParameters.cmake +++ b/cmake/macros/SetPackagingParameters.cmake @@ -38,6 +38,12 @@ macro(SET_PACKAGING_PARAMETERS) set(CLIENT_COMPONENT client) set(SERVER_COMPONENT server) + if (APPLE) + set(INTERFACE_BUNDLE_NAME "Vircadia") + else() + set(INTERFACE_BUNDLE_NAME "interface") + endif() + if (RELEASE_TYPE STREQUAL "PRODUCTION") set(DEPLOY_PACKAGE TRUE) set(PRODUCTION_BUILD 1) @@ -45,7 +51,6 @@ macro(SET_PACKAGING_PARAMETERS) set(BUILD_ORGANIZATION "Vircadia") set(HIGH_FIDELITY_PROTOCOL "hifi") set(HIGH_FIDELITY_APP_PROTOCOL "hifiapp") - set(INTERFACE_BUNDLE_NAME "interface") set(INTERFACE_ICON_PREFIX "interface") # add definition for this release type @@ -68,7 +73,6 @@ macro(SET_PACKAGING_PARAMETERS) set(PR_BUILD 1) set(BUILD_VERSION "PR${RELEASE_NUMBER}") set(BUILD_ORGANIZATION "Vircadia - PR${RELEASE_NUMBER}") - set(INTERFACE_BUNDLE_NAME "interface") set(INTERFACE_ICON_PREFIX "interface-beta") # add definition for this release type @@ -77,7 +81,6 @@ macro(SET_PACKAGING_PARAMETERS) set(DEV_BUILD 1) set(BUILD_VERSION "dev") set(BUILD_ORGANIZATION "Vircadia - ${BUILD_VERSION}") - set(INTERFACE_BUNDLE_NAME "interface") set(INTERFACE_ICON_PREFIX "interface-beta") # add definition for this release type diff --git a/cmake/macros/SetupHifiClientServerPlugin.cmake b/cmake/macros/SetupHifiClientServerPlugin.cmake index 1ce0b0ca6e..5c98ceb139 100644 --- a/cmake/macros/SetupHifiClientServerPlugin.cmake +++ b/cmake/macros/SetupHifiClientServerPlugin.cmake @@ -11,7 +11,11 @@ macro(SETUP_HIFI_CLIENT_SERVER_PLUGIN) setup_hifi_library() if (BUILD_CLIENT) - add_dependencies(interface ${TARGET_NAME}) + if (APPLE) + add_dependencies(Vircadia ${TARGET_NAME}) + else() + add_dependencies(interface ${TARGET_NAME}) + endif() endif() if (BUILD_SERVER) diff --git a/cmake/macros/SetupHifiPlugin.cmake b/cmake/macros/SetupHifiPlugin.cmake index 023c7603dc..22fa02dd79 100644 --- a/cmake/macros/SetupHifiPlugin.cmake +++ b/cmake/macros/SetupHifiPlugin.cmake @@ -9,7 +9,11 @@ macro(SETUP_HIFI_PLUGIN) set(${TARGET_NAME}_SHARED 1) setup_hifi_library(${ARGV}) if (BUILD_CLIENT) - add_dependencies(interface ${TARGET_NAME}) + if (APPLE) + add_dependencies(Vircadia ${TARGET_NAME}) + else() + add_dependencies(interface ${TARGET_NAME}) + endif() endif() target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT}) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Plugins") diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 0a0ade149d..a8ae3ddbf6 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -1,4 +1,10 @@ -set(TARGET_NAME interface) +if (APPLE) + # Make the OSX DMG app be Vircadia.app. + set(TARGET_NAME Vircadia) +else() + set(TARGET_NAME interface) +endif() + project(${TARGET_NAME}) file(GLOB_RECURSE QML_SRC resources/qml/*.qml resources/qml/*.js)