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

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

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

@ -20,8 +20,19 @@
# IN THE SOFTWARE. # IN THE SOFTWARE.
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# module OculusVR # module Hydra
option(TORQUE_HYDRA "Enable HYDRA module" OFF)
mark_as_advanced(TORQUE_HYDRA)
if(TORQUE_HYDRA)
if(TORQUE_HYDRA_SDK_PATH STREQUAL "")
set(TORQUE_HYDRA_SDK_PATH "" CACHE PATH "HYDRA library path" FORCE)
endif()
else() # hide variable
set(TORQUE_HYDRA_SDK_PATH "" CACHE INTERNAL "" FORCE)
endif()
if(TORQUE_HYDRA)
# Source # Source
addPathRec( "${srcDir}/platform/input/razerHydra" ) addPathRec( "${srcDir}/platform/input/razerHydra" )
@ -38,4 +49,4 @@ if( WIN32 )
# Only needed by the debug sixense library # Only needed by the debug sixense library
INSTALL(FILES "${TORQUE_RAZERHYDRA_SDK_PATH}/samples/win32/sixense_simple3d/DeviceDLL.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug" ) INSTALL(FILES "${TORQUE_RAZERHYDRA_SDK_PATH}/samples/win32/sixense_simple3d/DeviceDLL.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug" )
endif() endif()
endif()

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

@ -21,7 +21,10 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Navigation module # Navigation module
option(TORQUE_NAVIGATION "Enable Navigation module" OFF)
#mark_as_advanced(TORQUE_NAVIGATION)
if(TORQUE_NAVIGATION)
addDef( "TORQUE_NAVIGATION_ENABLED" ) addDef( "TORQUE_NAVIGATION_ENABLED" )
addLib( "recast" ) addLib( "recast" )
@ -34,4 +37,4 @@ addInclude( "${libDir}/recast/Recast/Include" )
addInclude( "${libDir}/recast/Detour/Include" ) addInclude( "${libDir}/recast/Detour/Include" )
addInclude( "${libDir}/recast/DetourTileCache/Include" ) addInclude( "${libDir}/recast/DetourTileCache/Include" )
addInclude( "${libDir}/recast/DetourCrowd/Include" ) addInclude( "${libDir}/recast/DetourCrowd/Include" )
endif(TORQUE_NAVIGATION)

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

@ -22,6 +22,17 @@
# module OculusVR # module OculusVR
option(TORQUE_OCULUSVR "Enable OCULUSVR module" OFF)
mark_as_advanced(TORQUE_OCULUSVR)
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()
if(TORQUE_OCULUSVR)
# Source # Source
addPathRec( "${srcDir}/platform/input/oculusVR" ) addPathRec( "${srcDir}/platform/input/oculusVR" )
@ -35,3 +46,4 @@ if( WIN32 )
addLib( "libovr" ) addLib( "libovr" )
addLib( "libovrd" ) 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