Only set CEF settings to OpenSpaceTest if OpenSpace is compiled with tests (closes #778)

Do not disable RTTI on CEF targets
Do not for Unicode on CEF targets
More graceful handling of torrent classes in Sync module
This commit is contained in:
Alexander Bock
2018-12-03 14:00:08 -05:00
parent 9d4b26a6c3
commit 36d0f71913
7 changed files with 39 additions and 13 deletions
+6
View File
@@ -27,7 +27,9 @@
#include <openspace/util/openspacemodule.h>
#ifdef SYNC_USE_LIBTORRENT
#include <modules/sync/torrentclient.h>
#endif // SYNC_USE_LIBTORRENT
namespace openspace {
@@ -42,7 +44,9 @@ public:
void addHttpSynchronizationRepository(std::string repository);
std::vector<std::string> httpSynchronizationRepositories() const;
#ifdef SYNC_USE_LIBTORRENT
TorrentClient& torrentClient();
#endif // SYNC_USE_LIBTORRENT
std::vector<documentation::Documentation> documentations() const override;
@@ -51,7 +55,9 @@ protected:
void internalDeinitialize() override;
private:
#ifdef SYNC_USE_LIBTORRENT
TorrentClient _torrentClient;
#endif // SYNC_USE_LIBTORRENT
std::vector<std::string> _synchronizationRepositories;
std::string _synchronizationRoot;
};