Merge from default

--HG--
branch : stable

INSTALL.md

@@ -13,7 +13,7 @@ Supported Systems/Compilers
 ===========================
 Operating systems officially supported by the SIMDIS SDK:
 
-* Windows 7/8/10
+* Windows 10
 * Red Hat Enterprise Linux 6/7
 
 Compilers officially supported by the SIMDIS SDK:
@@ -42,7 +42,7 @@ Third Party Dependencies
 The SIMDIS SDK depends on the following third party libraries:
 
 - [OpenSceneGraph 3.6+](http://www.openscenegraph.org)
-- [osgEarth 3.0+](http://www.osgearth.org)
+- [osgEarth 3.1+](http://www.osgearth.org)
 - [protobuf 2.6+](http://code.google.com/p/protobuf)
 - [Python 3.6+](https://www.python.org/)
 - [Qt 5.5+](http://qt-project.org)

README.md

@@ -82,11 +82,12 @@ texture files within a single, easy to distribute file.
 
 Support
 =======
-Limited free support is available on the [SIMDIS Help Desk].  Create a new topic
-under the project SDK for assistance.  You can search through previously answered
-tickets to find solutions to common problems.  An account on the SIMDIS website
-is required to access the Help Desk.  Use of the [SIMDIS Help Desk] is the fastest
-and most reliable way to get free support for the SIMDIS SDK.
+Limited free support is available on either the [SIMDIS Help Desk CAC Required] or
+[SIMDIS Help Desk Public].  Create a new topic under the project SDK for assistance.
+You can search through previously answered tickets to find solutions to common
+problems.  An account on the either website is required to access the Help Desk.
+Use of the either help desk is the fastest and most reliable way to get free support
+for the SIMDIS SDK.
 
 We also accept pull requests.  If there are modifications you wish to share with
 the community, please consider submitting a pull request.  All pull requests should
@@ -103,6 +104,7 @@ applications in the SIMDIS toolkit.
   [OpenSceneGraph]: <https://github.com/OpenSceneGraph/OpenSceneGraph>
   [osgEarth]: <https://github.com/gwaldron/osgearth>
   [SIMDIS]: <https://simdis.nrl.navy.mil>
-  [SIMDIS Help Desk]: <https://simdis.nrl.navy.mil/jira>
+  [SIMDIS Help Desk CAC Required]: <https://www.trmc.osd.mil/helpdesk/projects/SIMDIS>
+  [SIMDIS Help Desk Public]: <https://www.tena-sda.org/helpdesk/projects/SIMDIS>
   [Pelican Mapping]: <http://www.pelicanmapping.com>
 

Testing/SimQt/CMakeLists.txt

@@ -8,13 +8,11 @@ endif()
 project(SimQt_UnitTests)
 
 set(SimQtTestsSourceList
-    ActionRegistryTest.cpp
-    GradientTest.cpp
     SettingsTest.cpp
     PersistentLoggerTest.cpp
     SegmentedTextsTest.cpp
 )
-set_source_files_properties(ActionRegistryTest.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
+
 if(TARGET simData)
     list(APPEND SimQtTestsSourceList
         RangeToRegExpTest.cpp
@@ -23,7 +21,13 @@ endif()
 if(TARGET simVis)
     # QColorTest requires QtConversion.h, which requires osg/Vec4
     list(APPEND SimQtTestsSourceList
-        QColorTest.cpp
+        ActionRegistryTest.cpp QColorTest.cpp
+    )
+    set_source_files_properties(ActionRegistryTest.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
+endif()
+if(OSG_FOUND)
+    list(APPEND SimQtTestsSourceList
+        GradientTest.cpp
     )
 endif()
 
@@ -43,22 +47,24 @@ set_target_properties(SimQtTests PROPERTIES
 
 VSI_QT_USE_MODULES(SimQtTests LINK_PRIVATE Widgets)
 
-add_test(NAME ActionRegistryTest COMMAND SimQtTests ActionRegistryTest)
 add_test(NAME SettingsTest COMMAND SimQtTests SettingsTest)
 add_test(NAME PersistentLoggerTest COMMAND SimQtTests PersistentLoggerTest)
-add_test(NAME GradientTest COMMAND SimQtTests GradientTest)
 add_test(NAME SegmentedTextsTest COMMAND SimQtTests SegmentedTextsTest)
 if(TARGET simData)
     add_test(NAME RangeToRegExpTest COMMAND SimQtTests RangeToRegExpTest)
 endif()
 if(TARGET simVis)
+    add_test(NAME ActionRegistryTest COMMAND SimQtTests ActionRegistryTest)
     add_test(NAME QColorTest COMMAND SimQtTests QColorTest)
     target_link_libraries(SimQtTests PRIVATE simVis)
+    # Set QT_PLUGIN_PATH, required for Qt 5.14 but not 5.9
+    set_tests_properties(
+            ActionRegistryTest
+        PROPERTIES
+            ENVIRONMENT "QT_PLUGIN_PATH=${_qt5Gui_install_prefix}/plugins"
+)
+endif()
+if(OSG_FOUND)
+    add_test(NAME GradientTest COMMAND SimQtTests GradientTest)
 endif()
 
-# Set QT_PLUGIN_PATH, required for Qt 5.14 but not 5.9
-set_tests_properties(
-        ActionRegistryTest
-    PROPERTIES
-        ENVIRONMENT "QT_PLUGIN_PATH=${_qt5Gui_install_prefix}/plugins"
-)