Skip to content

Commit 532d785

Browse files
bakpaulhugtalbot
andauthored
[CMake] Remove Qt from all configurations (#6072)
* Remove Qt from all configurations, and remove its presence from post-install scripts * Update lockfile --------- Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>
1 parent 912335e commit 532d785

12 files changed

Lines changed: 135 additions & 5791 deletions

CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ include(SofaMacros)
101101

102102
install(FILES
103103
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindEigen3.cmake"
104-
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/macdeployqt.cmake"
105-
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/windeployqt.cmake"
106104
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindTinyXML2.cmake"
107105
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindPNG.cmake"
108106
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindPCRE2.cmake"
@@ -396,12 +394,6 @@ if(SOFA_BUILD_RELEASE_PACKAGE)
396394
set(CPACK_IFW_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/applications/projects/runSofa/runSofa.icns")
397395
endif()
398396

399-
cpack_ifw_configure_component_group(runtime
400-
SORTING_PRIORITY 50
401-
DEFAULT TRUE
402-
EXPANDED
403-
SCRIPT "${CMAKE_SOURCE_DIR}/scripts/qtifw/install.qs"
404-
)
405397
cpack_ifw_configure_component_group(development
406398
SORTING_PRIORITY 10
407399
DEFAULT TRUE

CMakePresets.json

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -79,23 +79,6 @@
7979
}
8080
}
8181
},
82-
{
83-
"name": "allGUI",
84-
"displayName": "All GUI configurations",
85-
"description": "Hidden preset to be used to add all GUI to other preset",
86-
"hidden": true,
87-
"inherits": ["defaultGUI"],
88-
"cacheVariables": {
89-
"PLUGIN_SOFA_QT": {
90-
"type": "BOOL",
91-
"value": "ON"
92-
},
93-
"SOFA_FETCH_SOFA_QT": {
94-
"type": "BOOL",
95-
"value": "ON"
96-
}
97-
}
98-
},
9982
{
10083
"name": "standard",
10184
"displayName": "Standard Config",
@@ -126,7 +109,7 @@
126109
"displayName": "Supported Plugins Configuration",
127110
"description": "Adds all officially supported plugins by the SOFA Consortium",
128111
"hidden": false,
129-
"inherits": ["standard","allGUI"],
112+
"inherits": ["standard"],
130113
"cacheVariables": {
131114
"SOFA_FETCH_STLIB": {
132115
"type": "BOOL",
@@ -239,7 +222,7 @@
239222
"displayName": "Full Config",
240223
"description": "Adds all plugins known to be functional (Release configuration)",
241224
"hidden": false,
242-
"inherits": ["supported-plugins","allGUI"],
225+
"inherits": ["supported-plugins"],
243226
"cacheVariables": {
244227
"PLUGIN_DIFFUSIONSOLVER": {
245228
"type": "BOOL",

cmake/Modules/macdeployqt.cmake

Lines changed: 0 additions & 42 deletions
This file was deleted.

cmake/Modules/windeployqt.cmake

Lines changed: 0 additions & 136 deletions
This file was deleted.

cmake/Modules/windeployqt5.cmake

Lines changed: 0 additions & 4 deletions
This file was deleted.

cmake/Modules/windeployqt6.cmake

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)