mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-12 23:24:41 +00:00
kill dupe macro definitions, add macro(addFramework framework) for mac support to append frameworks, and further mark-as-advanced cleanups
This commit is contained in:
parent
e55d71f6ee
commit
8906c12ddd
4 changed files with 93 additions and 85 deletions
|
|
@ -1,12 +1,14 @@
|
|||
add_subdirectory(nativeFileDialogs ${CMAKE_BINARY_DIR}/temp/nfd EXCLUDE_FROM_ALL)
|
||||
|
||||
# Ask CMake to perform builds in a temporary directory for all of these.
|
||||
# We also use EXCLUDE_FROM_ALL to ensure we only build and install what we want
|
||||
set(SDL_SHARED on CACHE BOOL "" FORCE)
|
||||
add_subdirectory(sdl ${CMAKE_BINARY_DIR}/temp/sdl2 EXCLUDE_FROM_ALL)
|
||||
|
||||
# Png depends on zlib
|
||||
add_subdirectory(zlib ${CMAKE_BINARY_DIR}/temp/zlib EXCLUDE_FROM_ALL)
|
||||
#SDL
|
||||
set(SDL_SHARED ON CACHE BOOL "Build a shared version of the library" FORCE)
|
||||
set(SDL_STATIC OFF CACHE BOOL "Build a static version of the library" FORCE)
|
||||
mark_as_advanced(SDL2_DISABLE_INSTALL)
|
||||
mark_as_advanced(SDL2_DISABLE_SDL2MAIN)
|
||||
mark_as_advanced(SDL2_DISABLE_UNINSTALL)
|
||||
add_subdirectory(sdl ${CMAKE_BINARY_DIR}/temp/sdl2 EXCLUDE_FROM_ALL)
|
||||
add_subdirectory(nativeFileDialogs ${CMAKE_BINARY_DIR}/temp/nfd EXCLUDE_FROM_ALL)
|
||||
|
||||
# Assimp depends on zlib
|
||||
set(BUILD_SHARED_LIBS off CACHE BOOL "" FORCE)
|
||||
|
|
@ -18,13 +20,33 @@ add_subdirectory(assimp ${CMAKE_BINARY_DIR}/temp/assimp EXCLUDE_FROM_ALL)
|
|||
if (TORQUE_CPU_ARM32 OR TORQUE_CPU_ARM64)
|
||||
set(PNG_ARM_NEON on CACHE BOOL "" FORCE)
|
||||
endif (TORQUE_CPU_ARM32 OR TORQUE_CPU_ARM64)
|
||||
|
||||
#PNG
|
||||
set(PNG_STATIC on CACHE BOOL "" FORCE)
|
||||
mark_as_advanced(PNG_STATIC)
|
||||
set(PNG_SHARED off CACHE BOOL "" FORCE)
|
||||
mark_as_advanced(PNG_SHARED)
|
||||
set(PNG_BUILD_ZLIB on CACHE BOOL "" FORCE)
|
||||
mark_as_advanced(PNG_BUILD_ZLIB)
|
||||
set(PNG_TESTS off CACHE BOOL "" FORCE)
|
||||
mark_as_advanced(PNG_TESTS)
|
||||
set(PNG_HARDWARE_OPTIMIZATIONS on CACHE BOOL "" FORCE)
|
||||
mark_as_advanced(PNG_HARDWARE_OPTIMIZATIONS)
|
||||
if(APPLE)
|
||||
set(PNG_FRAMEWORK on CACHE BOOL "" FORCE)
|
||||
addDef(PNG_DEBUG Debug)
|
||||
endif()
|
||||
mark_as_advanced(PNG_DEBUG)
|
||||
mark_as_advanced(PNG_FRAMEWORK)
|
||||
mark_as_advanced(PNG_PREFIX)
|
||||
add_subdirectory(lpng ${CMAKE_BINARY_DIR}/temp/lpng EXCLUDE_FROM_ALL)
|
||||
|
||||
#ZLIB
|
||||
get_filename_component(ZLIB_ROOT "zlib" REALPATH BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
set(ZLIB_ROOT "${ZLIB_ROOT}" CACHE STRING "ZLib root location" FORCE)
|
||||
add_subdirectory(lpng ${CMAKE_BINARY_DIR}/temp/lpng EXCLUDE_FROM_ALL)
|
||||
mark_as_advanced(ZLIB_ROOT)
|
||||
# Png depends on zlib
|
||||
add_subdirectory(zlib ${CMAKE_BINARY_DIR}/temp/zlib EXCLUDE_FROM_ALL)
|
||||
|
||||
add_subdirectory(ljpeg ${CMAKE_BINARY_DIR}/temp/ljpeg EXCLUDE_FROM_ALL)
|
||||
add_subdirectory(tinyxml ${CMAKE_BINARY_DIR}/temp/tinyxml EXCLUDE_FROM_ALL)
|
||||
|
|
@ -33,4 +55,4 @@ add_subdirectory(pcre ${CMAKE_BINARY_DIR}/temp/pcre EXCLUDE_FROM_ALL)
|
|||
add_subdirectory(convexDecomp ${CMAKE_BINARY_DIR}/temp/convexDecomp EXCLUDE_FROM_ALL)
|
||||
add_subdirectory(squish ${CMAKE_BINARY_DIR}/temp/squish EXCLUDE_FROM_ALL)
|
||||
add_subdirectory(collada ${CMAKE_BINARY_DIR}/temp/collada EXCLUDE_FROM_ALL)
|
||||
add_subdirectory(glad ${CMAKE_BINARY_DIR}/temp/glad EXCLUDE_FROM_ALL)
|
||||
add_subdirectory(glad ${CMAKE_BINARY_DIR}/temp/glad EXCLUDE_FROM_ALL)
|
||||
Loading…
Add table
Add a link
Reference in a new issue