DEV: Updated stable to latest default

--HG--
branch : stable

.hgtags

@@ -1,3 +1,4 @@
+5603634972d94323c11198c54fbaa390c6aee59e stable-2020-06
 caab74eb7c5188e368c293c1b32fb516b0a3b95e simdis10.0_SR7
 caab74eb7c5188e368c293c1b32fb516b0a3b95e simdissdk-1.12
 14518462105ba7e265e3e6bb970c127656302861 stable-2019-12

CMakeImport/ImportQt5.cmake

@@ -136,7 +136,8 @@ macro(install_qtplugins dir)
             DESTINATION ${INSTALLSETTINGS_RUNTIME_DIR}/
             OPTIONAL
             COMPONENT ThirdPartyLibs
-            FILES_MATCHING PATTERN *.dll)
+            FILES_MATCHING PATTERN *.dll
+            PATTERN *d.dll EXCLUDE)
     else()
         # Note that Qt requires the Linux shared objects in the executable's subdirectory (e.g. bin)
         INSTALL(DIRECTORY ${_qt5Gui_install_prefix}/plugins/${dir}

CMakeModules/HelperFunctions.cmake

@@ -432,6 +432,23 @@ function(vsi_install_target TARGET COMPONENT)
     endif()
 endfunction()
 
+# vsi_write_basic_package_config_file(TARGET DEPS)
+#
+# Given a library TARGET that is being exported, generates a <TARGET>Config.cmake
+# file in the build directory for use in vsi_install_export().  This is particularly
+# useful in cases where the dependencies of the target are variable and cannot
+# be easily hardcoded into a <TARGET>Config.cmake.
+function(vsi_write_basic_package_config_file TARGET DEPS)
+    file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}Config.cmake"
+        "include(CMakeFindDependencyMacro)\n"
+        "set(DEPS \"${DEPS}\")\n"
+        "foreach(DEP IN LISTS DEPS)\n"
+        "    find_dependency(\${DEP})\n"
+        "endforeach()\n"
+        "include(\"\${CMAKE_CURRENT_LIST_DIR}/${TARGET}Targets.cmake\")\n"
+    )
+endfunction()
+
 # vsi_install_export(TARGET VERSION COMPATIBILITY)
 #
 # Given a library TARGET that is being exported, installs a generated <TARGET>Targets.cmake

Examples/ASIViewer/ASIViewer.cpp

@@ -162,7 +162,7 @@ struct AppData
   osgEarth::DateTime refDateTime_;
 
   explicit AppData(simData::DataStore *ds, simVis::View* view)
-  : timeSlider_(NULL),
+  : timeSlider_(nullptr),
     ds_(ds),
     view_(view),
     startTime_(0.0),

Examples/AngleTest/AngleTestExample.cpp

@@ -198,7 +198,7 @@ int main(int argc, char **argv)
   viewer->getMainView()->addOverlayControl(createHelp());
 
   /// Prime it
-  SetUpdate().onValueChanged(NULL, 0.0);
+  SetUpdate().onValueChanged(nullptr, 0.0);
 
   /// add some stock OSG handlers
   viewer->installDebugHandlers();

Examples/AnimatedLine/ExampleAnimatedLine.cpp

@@ -326,7 +326,7 @@ int main(int argc, char **argv)
   // Make the lines:
   addAnimatedLines(node1.get(), node2.get(), scene->getScenario(), scene->getMapNode());
   addAnimatedLines(node3.get(), node4.get(), scene->getScenario(), scene->getMapNode());
-  addAnimatedLines(NULL, NULL, scene->getScenario(), scene->getMapNode());
+  addAnimatedLines(nullptr, nullptr, scene->getScenario(), scene->getMapNode());
 
   // tick the sim
   dataStore.update(0);

Examples/AntennaPattern/ExampleAntennaPattern.cpp

@@ -70,23 +70,23 @@ struct AppData
   AppData()
    : platformId(0),
      beamId(0),
-     algorithm(NULL),
-     algorithmLabel(NULL),
-     polarity(NULL),
-     polarityLabel(NULL),
-     sensitivity(NULL),
-     frequency(NULL),
-     gain(NULL),
-     fov(NULL),
-     detail(NULL),
-     power(NULL),
-     width(NULL),
-     height(NULL),
-     scale(NULL),
-     weighting(NULL),
-     colorscale(NULL),
-     blending(NULL),
-     lighting(NULL)
+     algorithm(nullptr),
+     algorithmLabel(nullptr),
+     polarity(nullptr),
+     polarityLabel(nullptr),
+     sensitivity(nullptr),
+     frequency(nullptr),
+     gain(nullptr),
+     fov(nullptr),
+     detail(nullptr),
+     power(nullptr),
+     width(nullptr),
+     height(nullptr),
+     scale(nullptr),
+     weighting(nullptr),
+     colorscale(nullptr),
+     blending(nullptr),
+     lighting(nullptr)
   {
     algs.push_back(std::make_pair(simData::BeamPrefs_AntennaPattern_Algorithm_PEDESTAL, "PEDESTAL"));
     algs.push_back(std::make_pair(simData::BeamPrefs_AntennaPattern_Algorithm_GAUSS,    "GAUSS"));

Examples/ArticulatedModel/ExampleArticulatedModel.cpp

@@ -125,7 +125,7 @@ class FindNodeByName : public osg::NodeVisitor
   explicit FindNodeByName(const std::string& name)
     : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN),
       searchFor_(name),
-      node_(NULL)
+      node_(nullptr)
   {
   }
 
@@ -137,7 +137,7 @@ class FindNodeByName : public osg::NodeVisitor
       traverse(node);
   }
 
-  /** Retrieves the node from visitation, possibly NULL */
+  /** Retrieves the node from visitation, possibly nullptr */
   osg::Node* node() const
   {
     return node_.get();
@@ -155,8 +155,8 @@ class TankNode
 {
 public:
   TankNode()
-    : gun_(NULL),
-      turret_(NULL)
+    : gun_(nullptr),
+      turret_(nullptr)
   {
   }
   virtual ~TankNode()
@@ -187,48 +187,48 @@ class TankNode
 
   void setGunPitch(double pitchDeg)
   {
-    if (gun_ != NULL)
+    if (gun_ != nullptr)
       gun_->updateCurrentHPR(osg::Vec3f(0.0f, simCore::DEG2RAD * pitchDeg, 0.0f));
   }
   float gunPitch() const
   {
-    if (gun_ != NULL)
+    if (gun_ != nullptr)
       return simCore::RAD2DEG * gun_->getCurrentHPR().y();
     return 0.0f;
   }
   float gunMinimumPitch() const
   {
-    if (gun_ != NULL)
+    if (gun_ != nullptr)
       return simCore::RAD2DEG * gun_->getMinHPR().y();
     return 0.0f;
   }
   float gunMaximumPitch() const
   {
-    if (gun_ != NULL)
+    if (gun_ != nullptr)
       return simCore::RAD2DEG * gun_->getMaxHPR().y();
     return 0.0f;
   }
 
   void setTurretYaw(double yawDeg)
   {
-    if (turret_ != NULL)
+    if (turret_ != nullptr)
       turret_->updateCurrentHPR(osg::Vec3f(simCore::DEG2RAD * yawDeg, 0.0f, 0.0f));
   }
   float turretYaw() const
   {
-    if (turret_ != NULL)
+    if (turret_ != nullptr)
       return simCore::RAD2DEG * turret_->getCurrentHPR().x();
     return 0.0f;
   }
   float turretMinimumYaw() const
   {
-    if (turret_ != NULL)
+    if (turret_ != nullptr)
       return simCore::RAD2DEG * turret_->getMinHPR().x();
     return 0.0f;
   }
   float turretMaximumYaw() const
   {
-    if (turret_ != NULL)
+    if (turret_ != nullptr)
       return simCore::RAD2DEG * turret_->getMaxHPR().x();
     return 0.0f;
   }

Examples/BeamTest/BeamTest.cpp

@@ -112,35 +112,35 @@ struct AppData
   double               t_;
 
   AppData()
-   : typeSlider_(NULL),
-     typeLabel_(NULL),
-     modeSlider_(NULL),
-     modeLabel_(NULL),
-     rangeSlider_(NULL),
-     rangeLabel_(NULL),
-     horizSlider_(NULL),
-     horizLabel_(NULL),
-     vertSlider_(NULL),
-     vertLabel_(NULL),
-     azimuthSlider_(NULL),
-     azimuthLabel_(NULL),
-     elevSlider_(NULL),
-     elevLabel_(NULL),
-     colorSlider_(NULL),
-     colorLabel_(NULL),
-     capResSlider_(NULL),
-     capResLabel_(NULL),
-     coneResSlider_(NULL),
-     coneResLabel_(NULL),
-     useOffsetIconCheck_(NULL),
-     shadedCheck_(NULL),
-     blendedCheck_(NULL),
-     renderConeCheck_(NULL),
-     animateCheck_(NULL),
-     ds_(NULL),
+   : typeSlider_(nullptr),
+     typeLabel_(nullptr),
+     modeSlider_(nullptr),
+     modeLabel_(nullptr),
+     rangeSlider_(nullptr),
+     rangeLabel_(nullptr),
+     horizSlider_(nullptr),
+     horizLabel_(nullptr),
+     vertSlider_(nullptr),
+     vertLabel_(nullptr),
+     azimuthSlider_(nullptr),
+     azimuthLabel_(nullptr),
+     elevSlider_(nullptr),
+     elevLabel_(nullptr),
+     colorSlider_(nullptr),
+     colorLabel_(nullptr),
+     capResSlider_(nullptr),
+     capResLabel_(nullptr),
+     coneResSlider_(nullptr),
+     coneResLabel_(nullptr),
+     useOffsetIconCheck_(nullptr),
+     shadedCheck_(nullptr),
+     blendedCheck_(nullptr),
+     renderConeCheck_(nullptr),
+     animateCheck_(nullptr),
+     ds_(nullptr),
      hostId_(0),
      beamId_(0),
-     view_(NULL),
+     view_(nullptr),
      t_(0.0)
   {
     types_.push_back(std::make_pair(simData::BeamProperties_BeamType_ABSOLUTE_POSITION, "ABSOLUTE"));

Examples/CustomRenderingTest/CustomRenderingTest.cpp

@@ -219,7 +219,7 @@ class RenderEngine : public simVis::CustomRenderingNode::UpdateCallback
 
     // Adjust the coordinates of the locator to match that of the host
     auto host = node_->host();
-    if (host != NULL)
+    if (host != nullptr)
     {
       simCore::Coordinate coord;
       host->getLocator()->getCoordinate(&coord);
@@ -319,7 +319,7 @@ class AttachRenderGraphics : public simData::DataStore::DefaultListener
 
     // Pick out the node from the scene (created by the ScenarioDataStoreAdapter automatically)
     simVis::CustomRenderingNode* node = manager_->find<simVis::CustomRenderingNode>(newId);
-    if (node != NULL)
+    if (node != nullptr)
     {
       // A real render engine would need to account for multiple Custom Rendering nodes here,
       // either by creating a separate updater per entity, or configuring the updater to

Examples/EciTrackHistoryTest/EciTrackHistoryTest.cpp

@@ -83,21 +83,21 @@ struct AppData
   osg::ref_ptr<simUtil::SimulatorEventHandler> simHandler_;
 
   AppData(simData::DataStore* ds, simData::ObjectId hostId)
-   : modeSlider_(NULL),
-    timeTicksSlider_(NULL),
-    modeLabel_(NULL),
-    sizeLabel_(NULL),
-    timeTicksLabel_(NULL),
-    rewind1_(NULL),
-    rewind2_(NULL),
-    ff1_(NULL),
-    ff2_(NULL),
-    timeSlider_(NULL),
-    tether_(NULL),
+   : modeSlider_(nullptr),
+    timeTicksSlider_(nullptr),
+    modeLabel_(nullptr),
+    sizeLabel_(nullptr),
+    timeTicksLabel_(nullptr),
+    rewind1_(nullptr),
+    rewind2_(nullptr),
+    ff1_(nullptr),
+    ff2_(nullptr),
+    timeSlider_(nullptr),
+    tether_(nullptr),
     ds_(ds),
     hostId_(hostId),
-    view_(NULL),
-    platformModel_(NULL)
+    view_(nullptr),
+    platformModel_(nullptr)
   {
     modes_.push_back(std::make_pair(simData::TrackPrefs_Mode_OFF,    "OFF"));
     modes_.push_back(std::make_pair(simData::TrackPrefs_Mode_POINT,  "POINT"));
@@ -156,7 +156,7 @@ struct AppData
 
   void tether()
   {
-    view_->tetherCamera(NULL);
+    view_->tetherCamera(nullptr);
     view_->tetherCamera(platformModel_.get());
     view_->setFocalOffsets(45, -45, 2e4);
   }