TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Make torque3d.cmake load all .cmake files from the module folder.

Browse source 
Move option code to each individual module.
This makes it so you can add a new module without having to modify the torque3d.cmake
This commit is contained in:
Scott Przybylski 2014-10-10 23:50:05 -07:00
parent 5103ba22e2
commit f527b45ec2
5 changed files with 73 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Tools/CMake/modules/module_hydra.cmake
View file

@ -20,22 +20,33 @@
# IN THE SOFTWARE. # IN THE SOFTWARE.
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# module OculusVR # module Hydra
# Source
addPathRec( "${srcDir}/platform/input/razerHydra" )
# Includes option(TORQUE_HYDRA "Enable HYDRA module" OFF)
addInclude( "${TORQUE_RAZERHYDRA_SDK_PATH}/include" ) mark_as_advanced(TORQUE_HYDRA)
if(TORQUE_HYDRA)
# Install if(TORQUE_HYDRA_SDK_PATH STREQUAL "")
if( WIN32 ) set(TORQUE_HYDRA_SDK_PATH "" CACHE PATH "HYDRA library path" FORCE)
# File Copy for Release endif()
INSTALL(FILES "${TORQUE_RAZERHYDRA_SDK_PATH}/bin/win32/release_dll/sixense.dll" DESTINATION "${projectOutDir}") else() # hide variable
set(TORQUE_HYDRA_SDK_PATH "" CACHE INTERNAL "" FORCE)
# File Copy for Debug
INSTALL(FILES "${TORQUE_RAZERHYDRA_SDK_PATH}/bin/win32/debug_dll/sixensed.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug" )
# Only needed by the debug sixense library
INSTALL(FILES "${TORQUE_RAZERHYDRA_SDK_PATH}/samples/win32/sixense_simple3d/DeviceDLL.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug" )
endif() endif()
if(TORQUE_HYDRA)
# Source
addPathRec( "${srcDir}/platform/input/razerHydra" )
# Includes
addInclude( "${TORQUE_RAZERHYDRA_SDK_PATH}/include" )
# Install
if( WIN32 )
# File Copy for Release
INSTALL(FILES "${TORQUE_RAZERHYDRA_SDK_PATH}/bin/win32/release_dll/sixense.dll" DESTINATION "${projectOutDir}")
# File Copy for Debug
INSTALL(FILES "${TORQUE_RAZERHYDRA_SDK_PATH}/bin/win32/debug_dll/sixensed.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug" )
# Only needed by the debug sixense library
INSTALL(FILES "${TORQUE_RAZERHYDRA_SDK_PATH}/samples/win32/sixense_simple3d/DeviceDLL.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug" )
endif()
endif()

25
Tools/CMake/modules/module_navigation.cmake
View file

@ -21,17 +21,20 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Navigation module # Navigation module
option(TORQUE_NAVIGATION "Enable Navigation module" OFF)
#mark_as_advanced(TORQUE_NAVIGATION)
addDef( "TORQUE_NAVIGATION_ENABLED" ) if(TORQUE_NAVIGATION)
addLib( "recast" ) addDef( "TORQUE_NAVIGATION_ENABLED" )
addLib( "recast" )
# files # files
addPathRec( "${srcDir}/navigation" ) addPathRec( "${srcDir}/navigation" )
# include paths
addInclude( "${libDir}/recast/DebugUtils/Include" )
addInclude( "${libDir}/recast/Recast/Include" )
addInclude( "${libDir}/recast/Detour/Include" )
addInclude( "${libDir}/recast/DetourTileCache/Include" )
addInclude( "${libDir}/recast/DetourCrowd/Include" )
# include paths
addInclude( "${libDir}/recast/DebugUtils/Include" )
addInclude( "${libDir}/recast/Recast/Include" )
addInclude( "${libDir}/recast/Detour/Include" )
addInclude( "${libDir}/recast/DetourTileCache/Include" )
addInclude( "${libDir}/recast/DetourCrowd/Include" )
endif(TORQUE_NAVIGATION)

34
Tools/CMake/modules/module_oculusVR.cmake
View file

@ -21,17 +21,29 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# module OculusVR # module OculusVR
# Source
addPathRec( "${srcDir}/platform/input/oculusVR" )
# Includes option(TORQUE_OCULUSVR "Enable OCULUSVR module" OFF)
addInclude( "${TORQUE_OCULUSVR_SDK_PATH}/LibOVR/Include" ) mark_as_advanced(TORQUE_OCULUSVR)
addInclude( "${TORQUE_OCULUSVR_SDK_PATH}/LibOVR/Src" ) if(TORQUE_OCULUSVR)
if(TORQUE_OCULUSVR_SDK_PATH STREQUAL "")
set(TORQUE_OCULUSVR_SDK_PATH "" CACHE PATH "OCULUSVR library path" FORCE)
endif()
else() # hide variable
set(TORQUE_OCULUSVR_SDK_PATH "" CACHE INTERNAL "" FORCE)
endif()
# Libs if(TORQUE_OCULUSVR)
if( WIN32 ) # Source
link_directories( "${TORQUE_OCULUSVR_SDK_PATH}/LibOVR/Lib/Win32" ) addPathRec( "${srcDir}/platform/input/oculusVR" )
addLib( "libovr" )
addLib( "libovrd" ) # Includes
addInclude( "${TORQUE_OCULUSVR_SDK_PATH}/LibOVR/Include" )
addInclude( "${TORQUE_OCULUSVR_SDK_PATH}/LibOVR/Src" )
# Libs
if( WIN32 )
link_directories( "${TORQUE_OCULUSVR_SDK_PATH}/LibOVR/Lib/Win32" )
addLib( "libovr" )
addLib( "libovrd" )
endif()
endif() endif()

5
Tools/CMake/modules/module_testing.cmake
View file

@ -20,9 +20,10 @@
# IN THE SOFTWARE. # IN THE SOFTWARE.
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
option(TORQUE_TESTS_ENABLED "TORQUE_TESTS_ENABLED" OFF) option(TORQUE_TESTING "Enable unit test module" OFF)
mark_as_advanced(TORQUE_TESTING)
if(TORQUE_TESTS_ENABLED) if(TORQUE_TESTING)
# Project defines # Project defines
addDef( "TORQUE_TESTS_ENABLED" ) addDef( "TORQUE_TESTS_ENABLED" )

46
Tools/CMake/torque3d.cmake
View file

@ -58,10 +58,7 @@ option(TORQUE_HIFI "HIFI? support" OFF)
mark_as_advanced(TORQUE_HIFI) mark_as_advanced(TORQUE_HIFI)
option(TORQUE_EXTENDED_MOVE "Extended move support" OFF) option(TORQUE_EXTENDED_MOVE "Extended move support" OFF)
mark_as_advanced(TORQUE_EXTENDED_MOVE) mark_as_advanced(TORQUE_EXTENDED_MOVE)
option(TORQUE_NAVIGATION "Enable Navigation module" OFF)
#mark_as_advanced(TORQUE_NAVIGATION)
option(TORQUE_TESTING "Enable unit test module" OFF)
mark_as_advanced(TORQUE_TESTING)
if(WIN32) if(WIN32)
option(TORQUE_OPENGL "Allow OpenGL render" OFF) option(TORQUE_OPENGL "Allow OpenGL render" OFF)
#mark_as_advanced(TORQUE_OPENGL) #mark_as_advanced(TORQUE_OPENGL)
@ -70,24 +67,6 @@ else()
option(TORQUE_DEDICATED "Torque dedicated" OFF) option(TORQUE_DEDICATED "Torque dedicated" OFF)
endif() endif()
#Oculus VR
option(TORQUE_OCULUSVR "Enable OCULUSVR module" OFF)
mark_as_advanced(TORQUE_OCULUSVR)
if(TORQUE_OCULUSVR)
set(TORQUE_OCULUSVR_SDK_PATH "" CACHE PATH "OCULUSVR library path" FORCE)
else() # hide variable
set(TORQUE_OCULUSVR_SDK_PATH "" CACHE INTERNAL "" FORCE)
endif()
#Hydra
option(TORQUE_HYDRA "Enable HYDRA module" OFF)
mark_as_advanced(TORQUE_HYDRA)
if(TORQUE_HYDRA)
set(TORQUE_HYDRA_SDK_PATH "" CACHE PATH "HYDRA library path" FORCE)
else() # hide variable
set(TORQUE_HYDRA_SDK_PATH "" CACHE INTERNAL "" FORCE)
endif()
############################################################################### ###############################################################################
# options # options
############################################################################### ###############################################################################
@ -332,28 +311,15 @@ else()
addPath("${srcDir}/T3D/gameBase/std") addPath("${srcDir}/T3D/gameBase/std")
endif() endif()
if(TORQUE_TESTING)
include( "modules/module_testing.cmake" )
endif()
if(TORQUE_NAVIGATION)
include( "modules/module_navigation.cmake" )
endif()
if(TORQUE_OCULUSVR)
include( "modules/module_oculusVR.cmake" )
endif()
if(TORQUE_HYDRA)
include( "modules/module_hydra.cmake" )
endif()
if(TORQUE_DEDICATED) if(TORQUE_DEDICATED)
addDef(TORQUE_DEDICATED) addDef(TORQUE_DEDICATED)
endif() endif()
include( "modules/module_testing.cmake" ) #modules dir
file(GLOB modules "modules/*.cmake")
foreach(module ${modules})
include(${module})
endforeach()
############################################################################### ###############################################################################
# platform specific things # platform specific things