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

Merge pull request #1145 from BeamNG/dynamic-CMake-modules

Browse source 
Make CMake project load all .cmake files from the module folder Updated.
This commit is contained in:
Luis Anton Rebollo 2015-01-30 18:33:59 +01:00
commit c1b137f041
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

@ -75,10 +75,7 @@ if(WIN32)
else() else()
set(TORQUE_OPENGL ON) # we need OpenGL to render on Linux/Mac set(TORQUE_OPENGL ON) # we need OpenGL to render on Linux/Mac
endif() endif()
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)
@ -87,24 +84,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
############################################################################### ###############################################################################
@ -387,28 +366,15 @@ if(TORQUE_SDL)
add_subdirectory( ${libDir}/sdl ${CMAKE_CURRENT_BINARY_DIR}/sdl2) add_subdirectory( ${libDir}/sdl ${CMAKE_CURRENT_BINARY_DIR}/sdl2)
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