TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-23 21:35:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmake cleanups

Browse source 
new global defines: TORQUE_LIB_ROOT_DIRECTORY and TORQUE_LIB_TARG_DIRECTORY for source location and target to build static libs, respectively
reassign location back to torqueConfig.h, torque.rc, and Info.plist to  "${TORQUE_APP_ROOT_DIRECTORY}/source/ aka \My Projects\<apname>\source by request
This commit is contained in:
AzaezelX 2023-10-14 16:15:49 -05:00 • committed by Brian Roberts
parent a5e75dfd61
commit b278802645
7 changed files with 37 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Tools/CMake/modules/bullet.cmake
View file

@ -9,11 +9,11 @@ if(TORQUE_PHYSICS_BULLET)
Bullet2FileLoader BulletDynamics Bullet3OpenCL_clew Bullet3Common
LinearMath Bullet3Geometry Bullet3Collision)
set(TORQUE_COMPILE_DEFINITIONS ${TORQUE_COMPILE_DEFINITIONS} TORQUE_PHYSICS_BULLET TORQUE_PHYSICS_ENABLED)
set(TORQUE_INCLUDE_DIRECTORIES ${TORQUE_INCLUDE_DIRECTORIES} "${CMAKE_SOURCE_DIR}/Engine/lib/bullet/src" )
set(TORQUE_INCLUDE_DIRECTORIES ${TORQUE_INCLUDE_DIRECTORIES} "${TORQUE_LIB_ROOT_DIRECTORY}/bullet/src" )
# Since Bullet lives elsewhere we need to ensure it is known to Torque when providing a link to it
set(BUILD_SHARED_LIBS OFF CACHE BOOL "Bullet Shared Libs" FORCE)
set(BUILD_CPU_DEMOS OFF CACHE BOOL "Bullet CPU Demos" FORCE)
set(BUILD_BULLET2_DEMOS OFF CACHE BOOL "Bullet2 Demos" FORCE)
add_subdirectory("${CMAKE_SOURCE_DIR}/Engine/lib/bullet" ${CMAKE_BINARY_DIR}/temp/bullet EXCLUDE_FROM_ALL)
add_subdirectory("${TORQUE_LIB_ROOT_DIRECTORY}/bullet" ${TORQUE_LIB_TARG_DIRECTORY}/bullet EXCLUDE_FROM_ALL)
endif(TORQUE_PHYSICS_BULLET)

6
Tools/CMake/modules/module_curl.cmake
View file

@ -48,11 +48,11 @@ elseif(APPLE)
set(CURL_USE_OPENSSL OFF CACHE INTERNAL "" FORCE)
set(CURL_USE_SECTRANSP ON CACHE INTERNAL "" FORCE)
endif()
add_subdirectory("${CMAKE_SOURCE_DIR}/Engine/lib/curl" "${CMAKE_CURRENT_BINARY_DIR}/curl")
add_subdirectory("${TORQUE_LIB_ROOT_DIRECTORY}/curl" "${CMAKE_CURRENT_BINARY_DIR}/curl")
set(CURL_LIBRARIES libcurl)
set(CURL_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/Engine/lib/curl/include")
set(CURL_INCLUDE_DIRS "${TORQUE_LIB_ROOT_DIRECTORY}/curl/include")
set_property(TARGET libcurl APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS CURL_STATICLIB)
set(TORQUE_LINK_LIBRARIES ${TORQUE_LINK_LIBRARIES} libcurl)
set(TORQUE_INCLUDE_DIRECTORIES ${TORQUE_INCLUDE_DIRECTORIES} "${CMAKE_SOURCE_DIR}/Engine/lib/curl/src" )
set(TORQUE_INCLUDE_DIRECTORIES ${TORQUE_INCLUDE_DIRECTORIES} "${TORQUE_LIB_ROOT_DIRECTORY}/curl/src" )

2
Tools/CMake/modules/navigation.cmake
View file

@ -10,6 +10,6 @@ if(TORQUE_NAVIGATION)
set(TORQUE_COMPILE_DEFINITIONS ${TORQUE_COMPILE_DEFINITIONS} recast TORQUE_NAVIGATION_ENABLED)
# Since recast lives elsewhere we need to ensure it is known to Torque when providing a link to it
add_subdirectory("${CMAKE_SOURCE_DIR}/Engine/lib/recast" ${CMAKE_BINARY_DIR}/temp/recast EXCLUDE_FROM_ALL)
add_subdirectory("${TORQUE_LIB_ROOT_DIRECTORY}/recast" ${TORQUE_LIB_TARG_DIRECTORY}/recast EXCLUDE_FROM_ALL)
source_group(TREE "${CMAKE_SOURCE_DIR}/Engine/source/navigation/" PREFIX "Modules/NAVIGATION" FILES ${TORQUE_NAV_SOURCES})
endif(TORQUE_NAVIGATION)

2
Tools/CMake/modules/openal.cmake
View file

@ -23,5 +23,5 @@ if(TORQUE_SFX_OPENAL)
set(ALSOFT_UTILS OFF CACHE BOOL "OpenAL Utilities" FORCE)
set(ALSOFT_UPDATE_BUILD_VERSION OFF CACHE BOOL "Update build Version" UPDATE)
add_subdirectory("${CMAKE_SOURCE_DIR}/Engine/lib/openal-soft" ${CMAKE_BINARY_DIR}/temp/openal-soft EXCLUDE_FROM_ALL)
add_subdirectory("${TORQUE_LIB_ROOT_DIRECTORY}/openal-soft" ${TORQUE_LIB_TARG_DIRECTORY}/openal-soft EXCLUDE_FROM_ALL)
endif(TORQUE_SFX_OPENAL)