Remove SERVER_ONLY and CLIENT_ONLY environment variables.

.github/workflows/linux_server_build.yml

@@ -168,7 +168,7 @@ jobs:
           echo "OVERTE_USE_SYSTEM_QT=true" >> $GITHUB_ENV
         fi
 
-        echo "CMAKE_EXTRA=-DSERVER_ONLY=true -DBUILD_TOOLS=true" >> $GITHUB_ENV
+        echo "CMAKE_EXTRA=-DOVERTE_BUILD_SERVER=true -DOVERTE_BUILD_TOOLS=true -DOVERTE_BUILD_CLIENT=false" >> $GITHUB_ENV
 
     # Configuration is broken into multiple steps because you can't set an env var and also reference it in the same step
     - name: Configure Build Environment 2

.github/workflows/master_build.yml

@@ -116,10 +116,8 @@ jobs:
         echo "GIT_COMMIT_SHORT=${{ steps.buildenv1.outputs.github_sha_short }}" >> $GITHUB_ENV
         # Build type variables
         if [ "${{ matrix.build_type }}" = "full" ]; then
-          echo "CLIENT_ONLY=FALSE" >> $GITHUB_ENV
           echo "INSTALLER=Overte-${{ github.event.number }}_${{ github.sha }}-${{ steps.buildenv1.outputs.github_sha_short }}.$INSTALLER_EXT" >> $GITHUB_ENV
         else
-          echo "CLIENT_ONLY=TRUE" >> $GITHUB_ENV
           echo "INSTALLER=Overte-Interface-master$BUILD_NUMBER-${{ steps.buildenv1.outputs.github_sha_short }}.$INSTALLER_EXT" >> $GITHUB_ENV
         fi
 
@@ -214,13 +212,13 @@ jobs:
       if: startsWith(matrix.os, 'Windows') == false
       shell: bash
            # This syntax requires CMake 3.23
-      run: cmake --preset conan-${BUILD_TYPE,,} -DCLIENT_ONLY:BOOLEAN=$CLIENT_ONLY -DBYPASS_SIGNING:BOOLEAN=TRUE $CMAKE_EXTRA
+      run: cmake --preset conan-${BUILD_TYPE,,} -DBYPASS_SIGNING:BOOLEAN=TRUE $CMAKE_EXTRA
 
     - name: Configure CMake (Windows)
       if: startsWith(matrix.os, 'Windows')
       shell: bash
            # This syntax requires CMake 3.23
-      run: cmake --preset conan-default -DCLIENT_ONLY:BOOLEAN=$CLIENT_ONLY -DBYPASS_SIGNING:BOOLEAN=TRUE $CMAKE_EXTRA
+      run: cmake --preset conan-default -DBYPASS_SIGNING:BOOLEAN=TRUE $CMAKE_EXTRA
 
     - name: Build application
       shell: bash

.github/workflows/pr_build.yml

@@ -98,7 +98,7 @@ jobs:
             if [ "${{ matrix.build_type }}" = "full" ]; then
               echo "CMAKE_EXTRA=-DOVERTE_BUILD_TOOLS=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
             else
-              echo "CMAKE_EXTRA=-DCLIENT_ONLY=1 -DOVERTE_BUILD_TOOLS=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
+              echo "CMAKE_EXTRA=-DOVERTE_BUILD_SERVER=FALSE -DOVERTE_BUILD_TOOLS=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
             fi
 
           fi
@@ -107,7 +107,7 @@ jobs:
             if [ "${{ matrix.build_type }}" = "full" ]; then
               echo "CMAKE_EXTRA=-DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
             else
-              echo "CMAKE_EXTRA=-DCLIENT_ONLY=1 -DOVERTE_BUILD_TOOLS=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
+              echo "CMAKE_EXTRA=-DOVERTE_BUILD_SERVER=FALSE -DOVERTE_BUILD_TOOLS=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
             fi
           fi
         fi

.github/workflows/release_build.yml

@@ -82,7 +82,6 @@ jobs:
 
         echo "BUILD_NUMBER=$GIT_COMMIT_SHORT" >> $GITHUB_ENV
         echo "ARTIFACT_PATTERN=Overte-$RELEASE_NUMBER.$INSTALLER_EXT" >> $GITHUB_ENV
-        echo "CLIENT_ONLY=FALSE" >> $GITHUB_ENV
 
     - uses: actions/checkout@v4
       with:
@@ -130,7 +129,7 @@ jobs:
     - name: Configure CMake
       shell: bash
            # This syntax requires CMake 3.23
-      run: cmake --preset conan-${BUILD_TYPE,,} -DJSDOC_ENABLED:BOOL=TRUE -DCLIENT_ONLY:BOOLEAN=$CLIENT_ONLY -DBYPASS_SIGNING:BOOLEAN=TRUE $CMAKE_EXTRA
+      run: cmake --preset conan-${BUILD_TYPE,,} -DJSDOC_ENABLED:BOOL=TRUE -DBYPASS_SIGNING:BOOLEAN=TRUE $CMAKE_EXTRA
 
     - name: Build application
       shell: bash

BUILD.md

@@ -124,9 +124,6 @@ In the examples below the variable $NAME would be replaced by the name of the de
 
 The following build options can be used when running CMake
 
-* CLIENT_ONLY // Will package only the Interface
-* SERVER_ONLY // Will package only the Server
-
 * OVERTE_BUILD_CLIENT
 * OVERTE_BUILD_SERVER
 * OVERTE_BUILD_TESTS

CMakeLists.txt

@@ -113,14 +113,6 @@ project(overte)
 include("cmake/init.cmake")
 include("cmake/compiler.cmake")
 
-if (NOT DEFINED CLIENT_ONLY)
-  set(CLIENT_ONLY 0)
-endif()
-
-if (NOT DEFINED SERVER_ONLY)
-  set(SERVER_ONLY 0)
-endif()
-
 
 
 #
@@ -154,15 +146,6 @@ if (ANDROID OR UWP)
     set(OVERTE_BUILD_INSTALLER OFF CACHE BOOL FORCE "Overwritten (mobile build)")
 endif()
 
-if (CLIENT_ONLY)
-  set(BUILD_SERVER_OPTION OFF)
-endif()
-
-if (SERVER_ONLY)
-  set(BUILD_CLIENT_OPTION OFF)
-  set(BUILD_TESTS_OPTION OFF)
-endif()
-
 if (ANDROID)
   set(PLATFORM_QT_COMPONENTS AndroidExtras WebView)
   add_definitions(-DHIFI_ANDROID_APP=\"${HIFI_ANDROID_APP}\")
@@ -257,6 +240,14 @@ if (UNIX AND DEFINED ENV{HIFI_MEMORY_DEBUGGING})
   MESSAGE(STATUS "Memory debugging is enabled")
 endif()
 
+# Set SERVER_ONLY and CLIENT_ONLY for later packaging.
+if ((NOT OVERTE_BUILD_CLIENT) AND OVERTE_BUILD_SERVER)
+    set(SERVER_ONLY ON CACHE BOOL INTERNAL "")
+elseif ((NOT OVERTE_BUILD_SERVER) AND OVERTE_BUILD_CLIENT)
+    set(CLIENT_ONLY ON CACHE BOOL INTERNAL "")
+endif()
+
+
 #
 # Helper projects
 #

INSTALLER.md

@@ -109,7 +109,7 @@ For code signing to work, you will need to set the `HF_PFX_FILE` and `HF_PFX_PAS
 1. Ensure you have all the prerequisites fulfilled from the [MacOS Build Guide](BUILD_OSX.md).
 2. Perform a clean CMake in your build folder. e.g.
     ```bash
-    BUILD_GLOBAL_SERVICES=STABLE USE_STABLE_GLOBAL_SERVICES=1 RELEASE_BUILD=PRODUCTION BUILD_NUMBER="Insert Build Identifier here e.g. short hash of your last Git commit" STABLE_BUILD=1 PRODUCTION_BUILD=1 RELEASE_NUMBER="Insert Release Version Here e.g. 1.1.0" RELEASE_TYPE=PRODUCTION cmake -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk" -DCLIENT_ONLY=1 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOSX_SDK=10.12  ..
+    BUILD_GLOBAL_SERVICES=STABLE USE_STABLE_GLOBAL_SERVICES=1 RELEASE_BUILD=PRODUCTION BUILD_NUMBER="Insert Build Identifier here e.g. short hash of your last Git commit" STABLE_BUILD=1 PRODUCTION_BUILD=1 RELEASE_NUMBER="Insert Release Version Here e.g. 1.1.0" RELEASE_TYPE=PRODUCTION cmake -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk" -DOVERTE_BUILD_SERVER=0 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOSX_SDK=10.12  ..
     ```
 3. Pick a method to build and package your release.
 
@@ -223,7 +223,7 @@ conan install . -s build_type=Release -b missing -pr:b=default -of build
 ```
 Add `PRODUCTION_BUILD=1` to below command for release and release candidate builds.
 ```bash
-cmake --preset conan-release -DSERVER_ONLY=true -DOVERTE_BUILD_TOOLS=true
+cmake --preset conan-release -DOVERTE_BUILD_CLIENT=false -DOVERTE_BUILD_TOOLS=true
 ```
 
 4. Build

cmake/macros/SetPackagingParameters.cmake

@@ -135,10 +135,10 @@ macro(SET_PACKAGING_PARAMETERS)
     set(INTERFACE_INSTALL_DIR     ".")
     set(NITPICK_INSTALL_DIR       ".")
 
-    if (CLIENT_ONLY)
-      set(CONSOLE_EXEC_NAME "Console.app")
+    if (NOT OVERTE_BUILD_SERVER)
+        set(CONSOLE_EXEC_NAME "Console.app")
     else ()
-      set(CONSOLE_EXEC_NAME "Sandbox.app")
+        set(CONSOLE_EXEC_NAME "Sandbox.app")
     endif()
     set(CONSOLE_INSTALL_APP_PATH "${CONSOLE_INSTALL_DIR}/${CONSOLE_EXEC_NAME}")
 

plugins/CMakeLists.txt

@@ -12,7 +12,7 @@ file(GLOB PLUGIN_SUBDIRS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT
 list(REMOVE_ITEM PLUGIN_SUBDIRS "CMakeFiles")
 
 # client-side plugins
-if (NOT SERVER_ONLY AND NOT ANDROID)
+if (OVERTE_BUILD_CLIENT AND NOT ANDROID)
   if (WIN32 AND (NOT OVERTE_RENDERING_BACKEND STREQUAL "GLES"))
       set(DIR "oculus")
       add_subdirectory(${DIR})