File tree Expand file tree Collapse file tree 3 files changed +0
-40
lines changed
Expand file tree Collapse file tree 3 files changed +0
-40
lines changed Original file line number Diff line number Diff line change @@ -12,10 +12,6 @@ if(Sofa.GUI.Batch_FOUND)
1212 find_package (Sofa.GUI.Batch QUIET REQUIRED)
1313endif ()
1414
15- if (Sofa.GUI.Qt_FOUND)
16- find_package (Sofa.GUI.Qt QUIET REQUIRED)
17- endif ()
18-
1915if (Sofa.GUI.HeadlessRecorder_FOUND)
2016 find_package (Sofa.GUI.HeadlessRecorder QUIET REQUIRED)
2117endif ()
Original file line number Diff line number Diff line change @@ -21,12 +21,6 @@ if(Sofa.GUI.Batch_FOUND AND SP3_WITH_SOFAGUIBATCH)
2121 list (APPEND SUPPORTED_GUIS Sofa.GUI.Batch)
2222endif ()
2323
24- sofa_find_package(Sofa.GUI.Qt QUIET )
25- CMAKE_DEPENDENT_OPTION(SP3_WITH_SOFAGUIQT "Enable the SOFA Qt gui component." ON "Sofa.GUI.Qt_FOUND" OFF )
26- if (Sofa.GUI.Qt_FOUND AND SP3_WITH_SOFAGUIQT)
27- list (APPEND SUPPORTED_GUIS Sofa.GUI.Qt)
28- endif ()
29-
3024sofa_find_package(Sofa.GUI.HeadlessRecorder QUIET )
3125CMAKE_DEPENDENT_OPTION(SP3_WITH_SOFAGUIHEADLESSRECORDER "Enable the SOFA HeadlessRecorder gui component." ON "Sofa.GUI.HeadlessRecorder_FOUND" OFF )
3226if (Sofa.GUI.HeadlessRecorder_FOUND AND SP3_WITH_SOFAGUIHEADLESSRECORDER)
Original file line number Diff line number Diff line change @@ -31,12 +31,6 @@ using sofa::helper::system::FileSystem;
3131#define HAS_GUI_BATCH
3232#endif
3333
34- #if __has_include(<sofa/gui/qt/init.h>)
35- #include < sofa/gui/qt/init.h>
36- #include < sofa/gui/qt/qt.conf.h>
37- #define HAS_GUI_QT
38- #endif
39-
4034#if __has_include(<sofa/gui/headlessrecorder/init.h>)
4135#include < sofa/gui/headlessrecorder/init.h>
4236#define HAS_GUI_HEADLESSRECORDER
@@ -70,34 +64,10 @@ PYBIND11_MODULE(Gui, m) {
7064
7165 )doc" ;
7266
73- #ifdef HAS_GUI_QT
74- std::string sofaPrefixAbsolute = sofa::helper::Utils::getSofaPathPrefix ();
75- std::string inputFilepath = FileSystem::cleanPath (sofaPrefixAbsolute + " /bin/qt.conf" );
76- bool success = sofa::gui::qt::loadQtConfWithCustomPrefix (inputFilepath, sofaPrefixAbsolute);
77- if (success)
78- {
79- msg_info (" Sofa.Gui" ) << " Loaded qt.conf from " << inputFilepath << " customized with Prefix = " << sofaPrefixAbsolute;
80- }
81- else
82- {
83- msg_warning (" Sofa.Gui" ) << " Failed loading and/or customizing qt.conf from " << inputFilepath;
84-
85- std::cout << " qt_resource_data:" << std::endl;
86- for (auto d : qt_resource_data)
87- {
88- std::cout << d;
89- }
90- std::cout << std::endl;
91- }
92- #endif // HAS_GUI_QT
93-
9467// forcefullly link libraries at compile-time
9568#ifdef HAS_GUI_BATCH
9669 sofa::gui::batch::init ();
9770#endif
98- #ifdef HAS_GUI_QT
99- sofa::gui::qt::init ();
100- #endif
10171#ifdef HAS_GUI_HEADLESSRECORDER
10272 sofa::gui::headlessrecorder::init ();
10373#endif
You can’t perform that action at this time.
0 commit comments