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

Fixed CMake files

Browse Source
This commit is contained in:
Patryk Skowroński
2025-02-03 16:17:59 +01:00
committed by Chris Hennes
parent f84052cb95
commit af2ad11115
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake
View File

@@ -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")

9
src/Gui/CMakeLists.txt
View File

@@ -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)