kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Spaceball settings tabs removal from the Customize panel (#14589)

Browse Source 
* Removed Spaceball tabs for NavLib integration

* Added missing CMake variable for MacOS/Linux platform

---------

Co-authored-by: Patryk Skowroński <pskowronski@3dconnexion.com>
This commit is contained in:
Patryk Skowroński
2024-06-24 18:06:25 +02:00
committed by GitHub
parent 8465ea881a
commit fefd3851ac
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake
View File

@@ -142,8 +142,10 @@ macro(InitializeFreeCADBuildOptions)
option(ENABLE_DEVELOPER_TESTS "Build the FreeCAD unit tests suit" ON)
if(MSVC)
set(FREECAD_3CONNEXION_SUPPORT "NavLib" CACHE STRING "Select version of the 3Dconnexion device integration")
set_property(CACHE FREECAD_3CONNEXION_SUPPORT PROPERTY STRINGS "NavLib" "SpNav")
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")
else(MSVC)
set(FREECAD_3DCONNEXION_SUPPORT "Raw input")
endif(MSVC)
if(MSVC)
@@ -165,7 +167,7 @@ macro(InitializeFreeCADBuildOptions)
option(FREECAD_USE_PCL "Build the features that use PCL libs" OFF)
endif(NOT MSVC)
if(FREECAD_3CONNEXION_SUPPORT STREQUAL "NavLib" AND FREECAD_USE_3DCONNEXION)
if(FREECAD_3DCONNEXION_SUPPORT STREQUAL "NavLib" AND FREECAD_USE_3DCONNEXION)
set(FREECAD_USE_3DCONNEXION_NAVLIB ON)
set(FREECAD_USE_3DCONNEXION OFF)
endif()