Fixed CMake files for a runtime switch

Kuzma30 · Jan 9, 2025 · f2fb3f6 · f2fb3f6
1 parent c3887bf
commit f2fb3f6
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 39 deletions.
diff --git a/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake b/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake
@@ -144,28 +144,28 @@ macro(InitializeFreeCADBuildOptions)
 
     if(MSVC OR APPLE)
         set(FREECAD_3DCONNEXION_SUPPORT "NavLib" CACHE STRING "Select version of the 3Dconnexion device integration")
-        set_property(CACHE FREECAD_3DCONNEXION_SUPPORT PROPERTY STRINGS "NavLib" "Raw input" "Both")
-        option(FREECAD_USE_3DCONNEXION "Use the 3D connexion SDK to support 3d mouse." ON)
+        set_property(CACHE FREECAD_3DCONNEXION_SUPPORT PROPERTY STRINGS "None" "NavLib" "Legacy" "Both")
     else(MSVC OR APPLE)
-        set(FREECAD_USE_3DCONNEXION_RAWINPUT ON)
-        set(FREECAD_USE_3DCONNEXION OFF )
+        set(FREECAD_USE_3DCONNEXION_LEGACY ON)
     endif(MSVC OR APPLE)
 
-    if(FREECAD_3DCONNEXION_SUPPORT STREQUAL "NavLib" AND FREECAD_USE_3DCONNEXION)
+    if(FREECAD_3DCONNEXION_SUPPORT STREQUAL "NavLib")
         set(FREECAD_USE_3DCONNEXION_NAVLIB ON)
-        set(FREECAD_USE_3DCONNEXION OFF)
-    elseif(FREECAD_3DCONNEXION_SUPPORT STREQUAL "Both" AND FREECAD_USE_3DCONNEXION)
+    elseif(FREECAD_3DCONNEXION_SUPPORT STREQUAL "Both")
         set(FREECAD_USE_3DCONNEXION_NAVLIB ON)
-        set(FREECAD_USE_3DCONNEXION_RAWINPUT ON)
+        set(FREECAD_USE_3DCONNEXION_LEGACY ON)
+    elseif(FREECAD_3DCONNEXION_SUPPORT STREQUAL "Legacy")
+        set(FREECAD_USE_3DCONNEXION_LEGACY ON)
+    elseif(FREECAD_3DCONNEXION_SUPPORT STREQUAL "None")
+        set(FREECAD_USE_3DCONNEXION_NAVLIB OFF)
+        set(FREECAD_USE_3DCONNEXION_LEGACY OFF)
     endif()
 
-    if(APPLE AND NOT (FREECAD_3DCONNEXION_SUPPORT STREQUAL "NavLib"))
+    if(APPLE AND FREECAD_USE_3DCONNEXION_LEGACY)
         find_library(3DCONNEXIONCLIENT_FRAMEWORK 3DconnexionClient)
-        if(IS_DIRECTORY ${3DCONNEXIONCLIENT_FRAMEWORK})
-            option(FREECAD_USE_3DCONNEXION "Use the 3D connexion SDK to support 3d mouse." ON)
-        else(IS_DIRECTORY ${3DCONNEXIONCLIENT_FRAMEWORK})
-            option(FREECAD_USE_3DCONNEXION "Use the 3D connexion SDK to support 3d mouse." OFF)
-        endif(IS_DIRECTORY ${3DCONNEXIONCLIENT_FRAMEWORK})
+        if(NOT (IS_DIRECTORY ${3DCONNEXIONCLIENT_FRAMEWORK}))
+            set(FREECAD_USE_3DCONNEXION_LEGACY OFF)
+        endif()
     endif()
 
     if(MSVC)

diff --git a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake
@@ -193,20 +193,16 @@ macro(PrintFinalReport)
     simple(OpenGLU_Incl [${OPENGL_INCLUDE_DIR}])
     simple(Coin3D "${COIN3D_VERSION} [${COIN3D_LIBRARIES}] [${COIN3D_INCLUDE_DIRS}]")
     simple(pivy ${PIVY_VERSION})
-    if (WIN32)
-        if (FREECAD_USE_3DCONNEXION_RAWINPUT AND FREECAD_USE_3DCONNEXION_NAVLIB)
-            simple(3Dconnexion "Building 3Dconnexion support with raw input and NavLib")
-        elseif (FREECAD_USE_3DCONNEXION)
-            simple(3Dconnexion "Building 3Dconnexion support with raw input")
+    if(WIN32 OR APPLE)
+        if(FREECAD_USE_3DCONNEXION_LEGACY AND FREECAD_USE_3DCONNEXION_NAVLIB)
+            simple(3Dconnexion "Building with 3Dconnexion legacy and NavLib support")
+        elseif(FREECAD_USE_3DCONNEXION_LEGACY)
+            simple(3Dconnexion "Building with 3Dconnexion legacy support")
         elseif(FREECAD_USE_3DCONNEXION_NAVLIB)
-            simple(3Dconnexion "Building 3Dconnexion support with NavLib")
+            simple(3Dconnexion "Building with 3Dconnexion NavLib support")
         else()
             simple(3Dconnexion "Not building 3Dconnexion device support")
         endif()
-    elseif(APPLE)
-        if (FREECAD_USE_3DCONNEXION)
-            simple(3Dconnexion "Building 3Dconnexion support with raw input")
-        endif()
     else()
         conditional(SPNAV SPNAV_FOUND "not found" "[${SPNAV_LIBRARY}] [${SPNAV_INCLUDE_DIR}]")
     endif()

diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt
@@ -19,21 +19,21 @@ IF(CMAKE_BUILD_TYPE)
     add_definitions(-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}")
 ENDIF(CMAKE_BUILD_TYPE)
 
-if (FREECAD_USE_3DCONNEXION)
+if (FREECAD_USE_3DCONNEXION_LEGACY)
     add_definitions(-D_USE_3DCONNEXION_SDK)
     if(APPLE)
         set(3DCONNEXION_LINKFLAGS "-F/Library/Frameworks -weak_framework 3DconnexionClient")
-        set(3DCONNEXION_INCLUDE_DIR ${3DCONNEXIONCLIENT_FRAMEWORK}/Headers
+        list(APPEND 3DCONNEXION_INCLUDE_DIR ${3DCONNEXIONCLIENT_FRAMEWORK}/Headers
                                     ${3DCONNEXIONCLIENT_FRAMEWORK}/Headers/3DconnexionClient )
     endif(APPLE)
-endif(FREECAD_USE_3DCONNEXION)
+endif(FREECAD_USE_3DCONNEXION_LEGACY)
 
 if(FREECAD_USE_3DCONNEXION_NAVLIB AND (MSVC OR APPLE))
     add_definitions(-DUSE_3DCONNEXION_NAVLIB)
     if(APPLE)
         add_definitions(-D__APPLE__)
     endif(APPLE)
-    set(3DCONNEXION_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/3rdParty/3Dconnexion/inc)
+    list(APPEND 3DCONNEXION_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/3rdParty/3Dconnexion/inc)
 endif(FREECAD_USE_3DCONNEXION_NAVLIB AND (MSVC OR APPLE))
 
 if (BUILD_VR)
@@ -78,7 +78,7 @@ if(MSVC)
          ${OPENGL_gl_LIBRARY}
     )
 
-    if(FREECAD_USE_3DCONNEXION)
+    if(FREECAD_USE_3DCONNEXION_LEGACY)
         list(APPEND FreeCADGui_LIBS
             hid
         )
@@ -275,7 +275,7 @@ SET(FreeCADGui_XML_SRCS
 SOURCE_GROUP("XML" FILES ${FreeCADApp_XML_SRCS})
 
 # The 3D Connexion SDK files
-if(FREECAD_USE_3DCONNEXION AND MSVC)
+if(FREECAD_USE_3DCONNEXION_LEGACY AND MSVC)
     SET(FreeCADGui_SDK_SRCS
         3Dconnexion/I3dMouseParams.h
         3Dconnexion/MouseParameters.cpp
@@ -294,9 +294,9 @@ if(FREECAD_USE_3DCONNEXION AND MSVC)
     list(APPEND FreeCADGui_connexion_HDRS
         ${FreeCADGui_SDK_MOC_HDRS}
     )
-endif(FREECAD_USE_3DCONNEXION AND MSVC)
+endif(FREECAD_USE_3DCONNEXION_LEGACY AND MSVC)
 
-if(FREECAD_USE_3DCONNEXION AND APPLE)
+if(FREECAD_USE_3DCONNEXION_LEGACY AND APPLE)
     SET(FreeCADGui_SDK_SRCS
         3Dconnexion/GuiAbstractNativeEvent.cpp
         3Dconnexion/GuiNativeEventMac.cpp
@@ -312,7 +312,7 @@ if(FREECAD_USE_3DCONNEXION AND APPLE)
     list(APPEND FreeCADGui_connexion_HDRS
         ${FreeCADGui_SDK_MOC_HDRS}
     )
-endif(FREECAD_USE_3DCONNEXION AND APPLE)
+endif(FREECAD_USE_3DCONNEXION_LEGACY AND APPLE)
 
 if(FREECAD_USE_3DCONNEXION_NAVLIB AND (MSVC OR APPLE))
     SET(NAVLIB_STUB_DIR ${CMAKE_SOURCE_DIR}/src/3rdParty/3Dconnexion/src)
@@ -414,9 +414,9 @@ SET(Gui_UIC_SRCS
     VectorListEditor.ui
 )
 
-if(FREECAD_USE_3DCONNEXION_RAWINPUT)
+if(FREECAD_USE_3DCONNEXION_LEGACY)
     list(APPEND Gui_UIC_SRCS DlgCustomizeSpNavSettings.ui)
-endif(FREECAD_USE_3DCONNEXION_RAWINPUT)
+endif(FREECAD_USE_3DCONNEXION_LEGACY)
 
 set (FreeCAD_TR_QRC ${CMAKE_CURRENT_BINARY_DIR}/Language/FreeCAD_translation.qrc)
 qt_find_and_add_translation(QM_SRCS "Language/FreeCAD_*.ts"
@@ -605,10 +605,10 @@ SET(Dialog_Customize_HPP_SRCS
     ListWidgetDragBugFix.h
 )
 
-if(FREECAD_USE_3DCONNEXION_RAWINPUT)
+if(FREECAD_USE_3DCONNEXION_LEGACY)
     list(APPEND Dialog_Customize_CPP_SRCS DlgCustomizeSpaceball.cpp DlgCustomizeSpNavSettings.cpp)
     list(APPEND Dialog_Customize_HPP_SRCS DlgCustomizeSpaceball.h DlgCustomizeSpNavSettings.h)
-endif(FREECAD_USE_3DCONNEXION_RAWINPUT)
+endif(FREECAD_USE_3DCONNEXION_LEGACY)
 
 SET(Dialog_Customize_SRCS
     ${Dialog_Customize_CPP_SRCS}
@@ -619,9 +619,9 @@ SET(Dialog_Customize_SRCS
     DlgToolbars.ui
 )
 
-if(FREECAD_USE_3DCONNEXION_RAWINPUT)
+if(FREECAD_USE_3DCONNEXION_LEGACY)
     list(APPEND Dialog_Customize_SRCS  DlgCustomizeSpNavSettings.ui)
-endif(FREECAD_USE_3DCONNEXION_RAWINPUT)
+endif(FREECAD_USE_3DCONNEXION_LEGACY)
 
 SOURCE_GROUP("Dialog\\Customize" FILES ${Dialog_Customize_SRCS})