diff --git a/CMakeLists.txt.user.18 b/CMakeLists.txt.user.18 deleted file mode 100644 index ef53a33704..0000000000 --- a/CMakeLists.txt.user.18 +++ /dev/null @@ -1,1084 +0,0 @@ - - - - - - EnvironmentId - {c787df28-2a1c-4631-b1bf-6fbdcb11138b} - - - ProjectExplorer.Project.ActiveTarget - 1 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop - Desktop - {047669de-9257-42d9-91d4-aa940d298051} - 0 - 0 - 1 - - false - /Users/birarda/code/hifi/checkouts/qt-android-build - - - - - false - - true - Make - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - clean - - true - - true - Make - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - all - - CMakeProjectManager.CMakeBuildConfiguration - - 1 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - assignment-client - - false - - 2 - - assignment-client (disabled) - - CMakeProjectManager.CMakeRunConfiguration.assignment-client - 3768 - false - true - false - false - true - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - gvr-interface - - false - - 2 - - gvr-interface - - CMakeProjectManager.CMakeRunConfiguration.gvr-interface - 3768 - false - true - false - false - true - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - physics-tests - - false - - 2 - - physics-tests (disabled) - - CMakeProjectManager.CMakeRunConfiguration.physics-tests - 3768 - false - true - false - false - true - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - shared-tests - - false - - 2 - - shared-tests (disabled) - - CMakeProjectManager.CMakeRunConfiguration.shared-tests - 3768 - false - true - false - false - true - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - bitstream2json - - false - - 2 - - bitstream2json (disabled) - - CMakeProjectManager.CMakeRunConfiguration.bitstream2json - 3768 - false - true - false - false - true - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - json2bitstream - - false - - 2 - - json2bitstream (disabled) - - CMakeProjectManager.CMakeRunConfiguration.json2bitstream - 3768 - false - true - false - false - true - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - mtc - - false - - 2 - - mtc (disabled) - - CMakeProjectManager.CMakeRunConfiguration.mtc - 3768 - false - true - false - false - true - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - voxel-edit - - false - - 2 - - voxel-edit (disabled) - - CMakeProjectManager.CMakeRunConfiguration.voxel-edit - 3768 - false - true - false - false - true - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - domain-server - - false - - 2 - - domain-server (disabled) - - CMakeProjectManager.CMakeRunConfiguration.domain-server - 3768 - false - true - false - false - true - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - ice-server - - false - - 2 - - ice-server (disabled) - - CMakeProjectManager.CMakeRunConfiguration.ice-server - 3768 - false - true - false - false - true - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - interface - - false - - 2 - - interface (disabled) - - CMakeProjectManager.CMakeRunConfiguration.interface - 3768 - false - true - false - false - true - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - audio-tests - - false - - 2 - - audio-tests (disabled) - - CMakeProjectManager.CMakeRunConfiguration.audio-tests - 3768 - false - true - false - false - true - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - jitter-tests - - false - - 2 - - jitter-tests (disabled) - - CMakeProjectManager.CMakeRunConfiguration.jitter-tests - 3768 - false - true - false - false - true - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - metavoxel-tests - - false - - 2 - - metavoxel-tests (disabled) - - CMakeProjectManager.CMakeRunConfiguration.metavoxel-tests - 3768 - false - true - false - false - true - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - networking-tests - - false - - 2 - - networking-tests (disabled) - - CMakeProjectManager.CMakeRunConfiguration.networking-tests - 3768 - false - true - false - false - true - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - octree-tests - - false - - 2 - - octree-tests (disabled) - - CMakeProjectManager.CMakeRunConfiguration.octree-tests - 3768 - false - true - false - false - true - - 16 - - - - ProjectExplorer.Project.Target.1 - - Android for armeabi-v7a (GCC 4.9, Qt 5.3.2) - Android for armeabi-v7a (GCC 4.9, Qt 5.3.2) - {62878afa-e9f1-4a0e-88df-0e6e0e2a52f1} - 0 - 0 - 0 - - false - /Users/birarda/code/hifi/checkouts/qt-android-cmake - - - - - all - - false - - true - Make - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - clean - - true - - true - Make - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Default - Default - CMakeProjectManager.CMakeBuildConfiguration - - 1 - - - - true - Deploy to Android device - - Qt4ProjectManager.AndroidDeployQtStep - true - - 1 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy to Android device - Deploy to Android device - Qt4ProjectManager.AndroidDeployConfiguration2 - - 1 - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - gvr-interface - - false - - 2 - - gvr-interface - - CMakeProjectManager.CMakeRunConfiguration.gvr-interface - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 2 - - - ProjectExplorer.Project.Updater.FileVersion - 18 - - - Version - 18 - - diff --git a/cmake/modules/FindGverb.cmake b/cmake/modules/FindGverb.cmake index 549c23c8a9..82602c53bf 100644 --- a/cmake/modules/FindGverb.cmake +++ b/cmake/modules/FindGverb.cmake @@ -33,7 +33,7 @@ else (GVERB_INCLUDE_DIRS) if (GVERB_FOUND) message(STATUS "Found Gverb: ${GVERB_INCLUDE_DIRS}") else (GVERB_FOUND) - message(FATAL_ERROR "Could NOT find Gverb. Read ./interface/externals/gverb/readme.txt") + message(FATAL_ERROR "Could NOT find Gverb. Read ./libraries/audio-client/externals/gverb/readme.txt") endif (GVERB_FOUND) endif(GVERB_INCLUDE_DIRS) \ No newline at end of file