From af2ad1111503d0ffb837855b873faf5b0b0e905a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Skowro=C5=84ski?= Date: Mon, 3 Feb 2025 16:17:59 +0100 Subject: [PATCH] Fixed CMake files --- .../FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake | 2 +- src/Gui/CMakeLists.txt | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake b/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake index 606df314b7..56d95da9a7 100644 --- a/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake +++ b/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake @@ -147,7 +147,7 @@ macro(InitializeFreeCADBuildOptions) set(FREECAD_3DCONNEXION_SUPPORT "NavLib" CACHE STRING "Select version of the 3Dconnexion device integration") set_property(CACHE FREECAD_3DCONNEXION_SUPPORT PROPERTY STRINGS "None" "NavLib" "Legacy" "Both") else(MSVC OR APPLE) - set(FREECAD_USE_3DCONNEXION_LEGACY ON) + option(FREECAD_USE_3DCONNEXION_LEGACY "Enable support for 3Dconnexion devices." ON) endif(MSVC OR APPLE) if(FREECAD_3DCONNEXION_SUPPORT STREQUAL "NavLib") diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index 19c3bcea31..c642702a8c 100644 --- a/src/Gui/CMakeLists.txt +++ b/src/Gui/CMakeLists.txt @@ -19,14 +19,14 @@ IF(CMAKE_BUILD_TYPE) add_definitions(-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}") ENDIF(CMAKE_BUILD_TYPE) -if (FREECAD_USE_3DCONNEXION_LEGACY) +if (FREECAD_USE_3DCONNEXION_LEGACY AND (MSVC OR APPLE)) add_definitions(-D_USE_3DCONNEXION_SDK) if(APPLE) set(3DCONNEXION_LINKFLAGS "-F/Library/Frameworks -weak_framework 3DconnexionClient") list(APPEND 3DCONNEXION_INCLUDE_DIR ${3DCONNEXIONCLIENT_FRAMEWORK}/Headers ${3DCONNEXIONCLIENT_FRAMEWORK}/Headers/3DconnexionClient ) endif(APPLE) -endif(FREECAD_USE_3DCONNEXION_LEGACY) +endif(FREECAD_USE_3DCONNEXION_LEGACY AND (MSVC OR APPLE)) if(FREECAD_USE_3DCONNEXION_NAVLIB AND (MSVC OR APPLE)) add_definitions(-DUSE_3DCONNEXION_NAVLIB) @@ -140,7 +140,8 @@ if(${Qt5WinExtras_FOUND}) ) endif() -IF(SPNAV_FOUND) +IF(SPNAV_FOUND AND FREECAD_USE_3DCONNEXION_LEGACY) + add_definitions(-D_USE_3DCONNEXION_SDK) if(SPNAV_USE_X11) add_definitions(-DSPNAV_USE_X11) if (FREECAD_QT_MAJOR_VERSION EQUAL 5 AND UNIX AND NOT APPLE) @@ -188,7 +189,7 @@ IF(SPNAV_FOUND) list(APPEND FreeCADGui_LIBS ${SPNAV_LIBRARIES} ) -ENDIF(SPNAV_FOUND) +ENDIF(SPNAV_FOUND AND FREECAD_USE_3DCONNEXION_LEGACY) IF(OCULUS_FOUND) add_definitions(-DOCULUS_FOUND)