Merge pull request #4012 from opensim-org/feature_opensim-disable-static-type-registration

Add OPENSIM_DISABLE_STATIC_TYPE_REGISTRATION cmake option

Author: adamkewley

CMakeLists.txt

@@ -173,9 +173,22 @@ By default, any application linking to osimCommon will create an
 written by OpenSim (incl. during static initialization) are written to
 both this file and the standard output streams." OFF)
 
+option(OPENSIM_DISABLE_STATIC_TYPE_REGISTRATION
+"Disable OpenSim from registering bundled `Object` types at static
+initialization time.
+
+If this is set to `ON` (i.e. disable static type registration) then
+downstream code *must* manually register the OpenSim types it plans
+on using by calling `RegisterTypes_osimLIBRARY` (e.g. `RegisterTypes_osimActuators`),
+or by manually registering each type (e.g. `Object::registerType(PhysicalOffsetFrame());`)." OFF)
+mark_as_advanced(OPENSIM_DISABLE_STATIC_TYPE_REGISTRATION)
+
 if(OPENSIM_DISABLE_LOG_FILE)
     add_definitions(-DOPENSIM_DISABLE_LOG_FILE=1)
 endif()
+if(OPENSIM_DISABLE_STATIC_TYPE_REGISTRATION)
+    add_definitions(-DOPENSIM_DISABLE_STATIC_TYPE_REGISTRATION=1)
+endif()
 
 set(OPENSIM_BUILD_INDIVIDUAL_APPS_DEFAULT OFF)
 if(WIN32)

OpenSim/Actuators/RegisterTypes_osimActuators.cpp

@@ -37,8 +37,9 @@
 using namespace OpenSim;
 using namespace std;
 
-static osimActuatorsInstantiator instantiator;
-
+#ifndef OPENSIM_DISABLE_STATIC_TYPE_REGISTRATION
+    static osimActuatorsInstantiator instantiator;
+#endif
 
 //_____________________________________________________________________________
 /**

OpenSim/Analyses/RegisterTypes_osimAnalyses.cpp

@@ -31,7 +31,9 @@
 using namespace OpenSim;
 using namespace std;
 
-static osimAnalysesInstantiator instantiator; 
+#ifndef OPENSIM_DISABLE_STATIC_TYPE_REGISTRATION
+    static osimAnalysesInstantiator instantiator;
+#endif
 
 //_____________________________________________________________________________
 /**

OpenSim/Common/Object.cpp

@@ -1747,7 +1747,8 @@ extern "C" OSIMCOMMON_API void RegisterTypes_osimCommon();
 void osimCommonInstantiator::registerDllClasses() 
 { 
         RegisterTypes_osimCommon(); 
-} 
-    
-static osimCommonInstantiator instantiator; 
+}
+#ifndef OPENSIM_DISABLE_STATIC_TYPE_REGISTRATION
+    static osimCommonInstantiator instantiator;
+#endif
 /// @endcond

OpenSim/ExampleComponents/RegisterTypes_osimExampleComponents.cpp

@@ -33,7 +33,9 @@
 using namespace std;
 using namespace OpenSim;
 
-static osimExampleComponentsInstantiator osimExampleComponentsInstantiator; 
+#ifndef OPENSIM_DISABLE_STATIC_TYPE_REGISTRATION
+   static osimExampleComponentsInstantiator osimExampleComponentsInstantiator;
+#endif
 
 //_____________________________________________________________________________
 /**

OpenSim/Examples/Moco/exampleMocoCustomEffortGoal/RegisterTypes_osimMocoCustomEffortGoal.cpp

@@ -20,7 +20,9 @@
 
 using namespace OpenSim;
 
-static osimMocoCustomEffortGoalInstantiator instantiator;
+#ifndef OPENSIM_DISABLE_STATIC_TYPE_REGISTRATION
+    static osimMocoCustomEffortGoalInstantiator instantiator;
+#endif
 
 OSIMMOCOCUSTOMEFFORTGOAL_API void RegisterTypes_osimMocoCustomEffortGoal() {
     try {

OpenSim/Examples/Plugins/CoupledBushingForceExample/RegisterTypes_osimPlugin.cpp

@@ -30,7 +30,9 @@
 using namespace OpenSim;
 using namespace std;
 
-static dllObjectInstantiator instantiator; 
+#ifndef OPENSIM_DISABLE_STATIC_TYPE_REGISTRATION
+    static dllObjectInstantiator instantiator;
+#endif
 
 //_____________________________________________________________________________
 /**

OpenSim/Examples/SymbolicExpressionReporter/RegisterTypes_osimExpPlugin.cpp

@@ -30,7 +30,9 @@
 using namespace OpenSim;
 using namespace std;
 
-static dllPluginObjectInstantiator dInstantiator; 
+#ifndef OPENSIM_DISABLE_STATIC_TYPE_REGISTRATION
+    static dllPluginObjectInstantiator dInstantiator;
+#endif
 
 //_____________________________________________________________________________
 /**

OpenSim/Moco/RegisterTypes_osimMoco.cpp

@@ -64,7 +64,9 @@
 
 using namespace OpenSim;
 
-static osimMocoInstantiator instantiator;
+#ifndef OPENSIM_DISABLE_STATIC_TYPE_REGISTRATION
+    static osimMocoInstantiator instantiator;
+#endif
 
 OSIMMOCO_API void RegisterTypes_osimMoco() {
     try {

OpenSim/OpenSim.h

@@ -42,5 +42,8 @@ class osimInstantiator
     }
 };
 
-static osimInstantiator instantiator;
+#ifndef OPENSIM_DISABLE_STATIC_TYPE_REGISTRATION
+    static osimInstantiator instantiator;
+#endif
+
 #endif // _opensim_h_