From cc9eb31d992aeb6bc8a04881c41bf1b60c7dd577 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Thu, 31 Oct 2019 09:11:38 -0700 Subject: [PATCH 1/3] Build in PR builds --- screenshare/CMakeLists.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/screenshare/CMakeLists.txt b/screenshare/CMakeLists.txt index c2e9cda120..111001ac07 100644 --- a/screenshare/CMakeLists.txt +++ b/screenshare/CMakeLists.txt @@ -32,6 +32,12 @@ elseif (APPLE) ) endif() -# Don't build the Screenshare Electron app when building the `ALL_BUILD` target. -# Don't build the Screenshare Electron app when a user selects "Build Solution" from within Visual Studio. -set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE EXCLUDE_FROM_DEFAULT_BUILD TRUE) +if (PR_BUILD) + # DO build the Screenshare Electron app when building the `ALL_BUILD` target. + # DO build the Screenshare Electron app when a user selects "Build Solution" from within Visual Studio. + set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE EXCLUDE_FROM_DEFAULT_BUILD TRUE) +else () + # DO NOT build the Screenshare Electron app when building the `ALL_BUILD` target. + # DO NOT build the Screenshare Electron app when a user selects "Build Solution" from within Visual Studio. + set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE EXCLUDE_FROM_DEFAULT_BUILD TRUE) +endif () From f8e516efb8e7c8f34722a80bfdeca89d70d68be6 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Thu, 31 Oct 2019 09:14:52 -0700 Subject: [PATCH 2/3] Fix typos from the last commit --- screenshare/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/screenshare/CMakeLists.txt b/screenshare/CMakeLists.txt index 111001ac07..d19535b238 100644 --- a/screenshare/CMakeLists.txt +++ b/screenshare/CMakeLists.txt @@ -35,9 +35,11 @@ endif() if (PR_BUILD) # DO build the Screenshare Electron app when building the `ALL_BUILD` target. # DO build the Screenshare Electron app when a user selects "Build Solution" from within Visual Studio. - set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE EXCLUDE_FROM_DEFAULT_BUILD TRUE) + set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL FALSE EXCLUDE_FROM_DEFAULT_BUILD FALSE) + set_target_properties(${TARGET_NAME}-npm-install PROPERTIES EXCLUDE_FROM_ALL FALSE EXCLUDE_FROM_DEFAULT_BUILD FALSE) else () # DO NOT build the Screenshare Electron app when building the `ALL_BUILD` target. # DO NOT build the Screenshare Electron app when a user selects "Build Solution" from within Visual Studio. set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE EXCLUDE_FROM_DEFAULT_BUILD TRUE) + set_target_properties(${TARGET_NAME}-npm-install PROPERTIES EXCLUDE_FROM_ALL TRUE EXCLUDE_FROM_DEFAULT_BUILD TRUE) endif () From c22f5097c077cf79f19ce513e9442e194bcb1412 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Thu, 31 Oct 2019 09:24:28 -0700 Subject: [PATCH 3/3] Make SCREENSHARE_EXE_PATH private --- interface/src/scripting/ScreenshareScriptingInterface.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/interface/src/scripting/ScreenshareScriptingInterface.h b/interface/src/scripting/ScreenshareScriptingInterface.h index de467ba4f0..af84999f01 100644 --- a/interface/src/scripting/ScreenshareScriptingInterface.h +++ b/interface/src/scripting/ScreenshareScriptingInterface.h @@ -11,6 +11,9 @@ class ScreenshareScriptingInterface : public QObject, public Dependency { public: ScreenshareScriptingInterface(); + Q_INVOKABLE void startScreenshare(QString displayName, QString userName, QString token, QString sessionID, QString apiKey); + +private: #if DEV_BUILD #ifdef Q_OS_WIN const QString SCREENSHARE_EXE_PATH{ PathUtils::projectRootPath() + "/screenshare/hifi-screenshare-win32-x64/hifi-screenshare.exe" }; @@ -30,8 +33,6 @@ public: const QString SCREENSHARE_EXE_PATH{ QCoreApplication::applicationDirPath() + "/hifi-screenshare/hifi-screenshare" }; #endif #endif - - Q_INVOKABLE void startScreenshare(QString displayName, QString userName, QString token, QString sessionID, QString apiKey); }; #endif // hifi_ScreenshareScriptingInterface_h \ No newline at end of file