From e534e14fd6f8848442924f4ce96b0eedb99a6699 Mon Sep 17 00:00:00 2001 From: xwu2git <3871873+xwu2git@users.noreply.github.com> Date: Mon, 22 Mar 2021 12:59:31 -0700 Subject: [PATCH] remove FRAMEWORK from configuration --- CMakeLists.txt | 6 ++---- doc/cmake.md | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 796a4e951..78c5295c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,9 +10,7 @@ endif() if (NOT DEFINED PLATFORM) set(PLATFORM "Xeon") endif() -if (NOT DEFINED FRAMEWORK) - set(FRAMEWORK "gst") -endif() +set(FRAMEWORK "gst") if (NOT DEFINED SCENARIO) set(SCENARIO "traffic") endif() @@ -80,5 +78,5 @@ endforeach() execute_process(COMMAND printf "\n\nThis script will build third party components licensed under various open source licenses into your container images. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses.\n\n") -execute_process(COMMAND printf "\n-- Setting: PLATFORM=${PLATFORM}, SCENARIO=${SCENARIO}, NOFFICES=${NOFFICES}, NCAMERAS=${NCAMERAS}, NANALYTICS=${NANALYTICS}, FRAMEWORK=${FRAMEWORK}, NETWORK=${NETWORK}\n") +execute_process(COMMAND printf "\n-- Setting: PLATFORM=${PLATFORM}, SCENARIO=${SCENARIO}, NOFFICES=${NOFFICES}, NCAMERAS=${NCAMERAS}, NANALYTICS=${NANALYTICS}, NETWORK=${NETWORK}\n") execute_process(COMMAND printf "-- Setting: REGISTRY=${REGISTRY}\n") diff --git a/doc/cmake.md b/doc/cmake.md index c99a95ea1..eeb255a87 100644 --- a/doc/cmake.md +++ b/doc/cmake.md @@ -4,7 +4,6 @@ Use the following definitions to customize the building process: - **REGISTRY**: Specify the URL of the privcay docker registry. - **PLATFORM**: Specify the target platform: `Xeon` or [`VCAC-A`](vcac-a.md). -- **FRAMEWORK**: Specify the target framework: `gst` or `ffmpeg` , Now `gst` is enabled. - **SCENARIO**: Specify the sample scenario(s): `traffic`, `stadium`, or their combination `traffic,stadium`. As each scenario runs its own set of services and databases, it is recommended that you run multiple scenarios only on a multiple-node deployment setting. - **NOFFICES**: Specify the number of offices in the deployment. Support 1-3 offices in the traffic scenario and 1 office in the stadium scenario. - **NCAMERAS**: Specify the number of cameras served in each office. Currently support 1-8 cameras. In the **stadium** scenario, you can specify the camera numbers as `<#service_queue_counting>,[#crowd_counting],[#entrance_counting]`. @@ -25,12 +24,12 @@ cmake -DNOFFICES=3 -DPLATFORM=Xeon .. ``` cd build -cmake -DPLATFORM=Xeon -DSCENARIO=traffic -DNOFFICES=3 -DNCAMERAS=5 -DNANALYTICS=3 FRAMEWORK=gst .. +cmake -DPLATFORM=Xeon -DSCENARIO=traffic -DNOFFICES=3 -DNCAMERAS=5 -DNANALYTICS=3 .. ``` ``` cd build -cmake -DPLATFORM=Xeon -DSCENARIO=stadium -DNOFFICES=1 -DNCAMERAS=5,1,3 -DNANALYTICS=5,1,3 FRAMEWORK=gst .. +cmake -DPLATFORM=Xeon -DSCENARIO=stadium -DNOFFICES=1 -DNCAMERAS=5,1,3 -DNANALYTICS=5,1,3 .. ``` ### Make Commands: