diff options
| author | coyot@coyot-sager-PC <coyot@coyot-sager-PC> | 2017-03-16 22:54:27 +0100 |
|---|---|---|
| committer | coyot@coyot-sager-PC <coyot@coyot-sager-PC> | 2017-03-16 22:54:27 +0100 |
| commit | 664e4b44662ff06ce88bd0a604b0fbf64643337e (patch) | |
| tree | e3fefc4dc66bf3cb834639669b9162709ade2312 /indra/cmake | |
| parent | fc56311ebf05d6d6c155e097bffbff9feb0c411f (diff) | |
| parent | ed5fda3271acf7917ea3ccc3aedab6f5a9401953 (diff) | |
merge
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/ViewerManager.cmake | 2 | ||||
| -rwxr-xr-x | indra/cmake/run_build_test.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/cmake/ViewerManager.cmake b/indra/cmake/ViewerManager.cmake new file mode 100644 index 0000000000..793ed78b6c --- /dev/null +++ b/indra/cmake/ViewerManager.cmake @@ -0,0 +1,2 @@ +include (Prebuilt) +use_prebuilt_binary(viewer-manager)
\ No newline at end of file diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py index f02c5e98b4..210e43b232 100755 --- a/indra/cmake/run_build_test.py +++ b/indra/cmake/run_build_test.py @@ -312,7 +312,7 @@ if __name__ == "__main__": import argparse parser = argparse.ArgumentParser() parser.add_argument("-d", "--debug", dest="loglevel", action="store_const", - const=logging.DEBUG, default=logging.WARNING) + const=logging.DEBUG, default=logging.INFO) parser.add_argument("-D", "--define", dest="vars", default=[], action="append", metavar="VAR=value", help="Add VAR=value to the env variables defined") |