mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-15 08:34:40 +00:00
Remove TABs on CMake files.
This commit is contained in:
parent
1e06fd2e60
commit
808dcb653c
1 changed files with 64 additions and 64 deletions
|
|
@ -35,14 +35,14 @@ macro(addPath dir)
|
||||||
${dir}/*.h)
|
${dir}/*.h)
|
||||||
LIST(APPEND ${PROJECT_NAME}_files "${tmpa}")
|
LIST(APPEND ${PROJECT_NAME}_files "${tmpa}")
|
||||||
LIST(APPEND ${PROJECT_NAME}_paths "${dir}")
|
LIST(APPEND ${PROJECT_NAME}_paths "${dir}")
|
||||||
#message(STATUS "addPath ${PROJECT_NAME} : ${tmpa}")
|
#message(STATUS "addPath ${PROJECT_NAME} : ${tmpa}")
|
||||||
#set(t "${${t}};${tmpa}")
|
#set(t "${${t}};${tmpa}")
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
# adds a file to the sources
|
# adds a file to the sources
|
||||||
macro(addFile filename)
|
macro(addFile filename)
|
||||||
LIST(APPEND ${PROJECT_NAME}_files "${filename}")
|
LIST(APPEND ${PROJECT_NAME}_files "${filename}")
|
||||||
#message(STATUS "addFile ${PROJECT_NAME} : ${filename}")
|
#message(STATUS "addFile ${PROJECT_NAME} : ${filename}")
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
# finds and adds sources files in a folder recursively
|
# finds and adds sources files in a folder recursively
|
||||||
|
|
@ -55,7 +55,7 @@ macro(addPathRec dir)
|
||||||
${dir}/*.h)
|
${dir}/*.h)
|
||||||
LIST(APPEND ${PROJECT_NAME}_files "${tmpa}")
|
LIST(APPEND ${PROJECT_NAME}_files "${tmpa}")
|
||||||
LIST(APPEND ${PROJECT_NAME}_paths "${dir}")
|
LIST(APPEND ${PROJECT_NAME}_paths "${dir}")
|
||||||
#message(STATUS "addPathRec ${PROJECT_NAME} : ${tmpa}")
|
#message(STATUS "addPathRec ${PROJECT_NAME} : ${tmpa}")
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
# adds a definition
|
# adds a definition
|
||||||
|
|
@ -187,17 +187,17 @@ macro(generateFiltersSpecial relDir)
|
||||||
string(REGEX REPLACE "(.*)(/[^/]*)$" "\\1" SRCGR ${SRCGR})
|
string(REGEX REPLACE "(.*)(/[^/]*)$" "\\1" SRCGR ${SRCGR})
|
||||||
# do not have any ../ dirs
|
# do not have any ../ dirs
|
||||||
string(REPLACE "../" "" SRCGR ${SRCGR})
|
string(REPLACE "../" "" SRCGR ${SRCGR})
|
||||||
IF("${SRCGR}" MATCHES "^torque3d/My Projects/.*$")
|
IF("${SRCGR}" MATCHES "^torque3d/My Projects/.*$")
|
||||||
string(REPLACE "torque3d/My Projects/${PROJECT_NAME}/" "" SRCGR ${SRCGR})
|
string(REPLACE "torque3d/My Projects/${PROJECT_NAME}/" "" SRCGR ${SRCGR})
|
||||||
string(REPLACE "/source" "" SRCGR ${SRCGR})
|
string(REPLACE "/source" "" SRCGR ${SRCGR})
|
||||||
endif()
|
endif()
|
||||||
# Source_group expects \\ (double antislash), not / (slash)
|
# Source_group expects \\ (double antislash), not / (slash)
|
||||||
string(REPLACE / \\ SRCGR ${SRCGR})
|
string(REPLACE / \\ SRCGR ${SRCGR})
|
||||||
#STRING(REPLACE "//" "/" SRCGR ${SRCGR})
|
#STRING(REPLACE "//" "/" SRCGR ${SRCGR})
|
||||||
IF(EXISTS "${f}" AND NOT IS_DIRECTORY "${f}")
|
IF(EXISTS "${f}" AND NOT IS_DIRECTORY "${f}")
|
||||||
#message(STATUS "FILE: ${f} -> ${SRCGR}")
|
#message(STATUS "FILE: ${f} -> ${SRCGR}")
|
||||||
source_group("${SRCGR}" FILES ${f})
|
source_group("${SRCGR}" FILES ${f})
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
endmacro()
|
endmacro()
|
||||||
# macro to add a static library
|
# macro to add a static library
|
||||||
|
|
@ -216,11 +216,11 @@ macro(addStaticLib)
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
generateFilters("${firstDir}")
|
generateFilters("${firstDir}")
|
||||||
if(TORQUE_STATIC)
|
if(TORQUE_STATIC)
|
||||||
add_library("${PROJECT_NAME}" STATIC ${${PROJECT_NAME}_files})
|
add_library("${PROJECT_NAME}" STATIC ${${PROJECT_NAME}_files})
|
||||||
else()
|
else()
|
||||||
add_library("${PROJECT_NAME}" SHARED ${${PROJECT_NAME}_files})
|
add_library("${PROJECT_NAME}" SHARED ${${PROJECT_NAME}_files})
|
||||||
endif()
|
endif()
|
||||||
# omg - only use the first folder ... otehrwise we get lots of header name collisions
|
# omg - only use the first folder ... otehrwise we get lots of header name collisions
|
||||||
#foreach(dir ${${PROJECT_NAME}_paths})
|
#foreach(dir ${${PROJECT_NAME}_paths})
|
||||||
addInclude("${firstDir}")
|
addInclude("${firstDir}")
|
||||||
|
|
@ -251,36 +251,36 @@ macro(addExecutable)
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
macro(setupVersionNumbers)
|
macro(setupVersionNumbers)
|
||||||
set(TORQUE_APP_VERSION_MAJOR 1 CACHE INTEGER "")
|
set(TORQUE_APP_VERSION_MAJOR 1 CACHE INTEGER "")
|
||||||
set(TORQUE_APP_VERSION_MINOR 0 CACHE INTEGER "")
|
set(TORQUE_APP_VERSION_MINOR 0 CACHE INTEGER "")
|
||||||
set(TORQUE_APP_VERSION_PATCH 0 CACHE INTEGER "")
|
set(TORQUE_APP_VERSION_PATCH 0 CACHE INTEGER "")
|
||||||
set(TORQUE_APP_VERSION_TWEAK 0 CACHE INTEGER "")
|
set(TORQUE_APP_VERSION_TWEAK 0 CACHE INTEGER "")
|
||||||
mark_as_advanced(TORQUE_APP_VERSION_TWEAK)
|
mark_as_advanced(TORQUE_APP_VERSION_TWEAK)
|
||||||
MATH(EXPR TORQUE_APP_VERSION "${TORQUE_APP_VERSION_MAJOR} * 1000 + ${TORQUE_APP_VERSION_MINOR} * 100 + ${TORQUE_APP_VERSION_PATCH} * 10 + ${TORQUE_APP_VERSION_TWEAK}")
|
MATH(EXPR TORQUE_APP_VERSION "${TORQUE_APP_VERSION_MAJOR} * 1000 + ${TORQUE_APP_VERSION_MINOR} * 100 + ${TORQUE_APP_VERSION_PATCH} * 10 + ${TORQUE_APP_VERSION_TWEAK}")
|
||||||
set(TORQUE_APP_VERSION_STRING "${TORQUE_APP_VERSION_MAJOR}.${TORQUE_APP_VERSION_MINOR}.${TORQUE_APP_VERSION_PATCH}.${TORQUE_APP_VERSION_TWEAK}")
|
set(TORQUE_APP_VERSION_STRING "${TORQUE_APP_VERSION_MAJOR}.${TORQUE_APP_VERSION_MINOR}.${TORQUE_APP_VERSION_PATCH}.${TORQUE_APP_VERSION_TWEAK}")
|
||||||
#message(STATUS "version numbers: ${TORQUE_APP_VERSION} / ${TORQUE_APP_VERSION_STRING}")
|
#message(STATUS "version numbers: ${TORQUE_APP_VERSION} / ${TORQUE_APP_VERSION_STRING}")
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
macro(setupPackaging)
|
macro(setupPackaging)
|
||||||
INCLUDE(CPack)
|
INCLUDE(CPack)
|
||||||
# only enable zips for now
|
# only enable zips for now
|
||||||
set(CPACK_BINARY_NSIS OFF CACHE INTERNAL "" FORCE)
|
set(CPACK_BINARY_NSIS OFF CACHE INTERNAL "" FORCE)
|
||||||
set(CPACK_BINARY_ZIP ON CACHE INTERNAL "" FORCE)
|
set(CPACK_BINARY_ZIP ON CACHE INTERNAL "" FORCE)
|
||||||
set(CPACK_SOURCE_ZIP OFF CACHE INTERNAL "" FORCE)
|
set(CPACK_SOURCE_ZIP OFF CACHE INTERNAL "" FORCE)
|
||||||
SET(CPACK_GENERATOR "ZIP")
|
SET(CPACK_GENERATOR "ZIP")
|
||||||
SET(CPACK_PACKAGE_VENDOR "${PROJECT_NAME}")
|
SET(CPACK_PACKAGE_VENDOR "${PROJECT_NAME}")
|
||||||
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME}")
|
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME}")
|
||||||
SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
|
SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
|
||||||
SET(CPACK_OUTPUT_FILE_PREFIX "${projectDir}/packages/${PROJECT_NAME}")
|
SET(CPACK_OUTPUT_FILE_PREFIX "${projectDir}/packages/${PROJECT_NAME}")
|
||||||
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "")
|
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "")
|
||||||
#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReadMe.txt")
|
#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReadMe.txt")
|
||||||
#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt")
|
#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt")
|
||||||
SET(CPACK_PACKAGE_VERSION_MAJOR "${TORQUE_APP_VERSION_MAJOR}")
|
SET(CPACK_PACKAGE_VERSION_MAJOR "${TORQUE_APP_VERSION_MAJOR}")
|
||||||
SET(CPACK_PACKAGE_VERSION_MINOR "${TORQUE_APP_VERSION_MINOR}")
|
SET(CPACK_PACKAGE_VERSION_MINOR "${TORQUE_APP_VERSION_MINOR}")
|
||||||
SET(CPACK_PACKAGE_VERSION_PATCH "${TORQUE_APP_VERSION_PATCH}")
|
SET(CPACK_PACKAGE_VERSION_PATCH "${TORQUE_APP_VERSION_PATCH}")
|
||||||
#SET(CPACK_PACKAGE_EXECUTABLES "${PROJECT_NAME}" "${PROJECT_NAME}")
|
#SET(CPACK_PACKAGE_EXECUTABLES "${PROJECT_NAME}" "${PROJECT_NAME}")
|
||||||
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${TORQUE_APP_VERSION_STRING}")
|
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${TORQUE_APP_VERSION_STRING}")
|
||||||
#SET(CPACK_SOURCE_STRIP_FILES "")
|
#SET(CPACK_SOURCE_STRIP_FILES "")
|
||||||
endmacro()
|
endmacro()
|
||||||
# always static for now
|
# always static for now
|
||||||
set(TORQUE_STATIC ON)
|
set(TORQUE_STATIC ON)
|
||||||
|
|
@ -289,36 +289,36 @@ set(TORQUE_STATIC ON)
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set(TORQUE_DISABLED_WARNINGS " ")
|
set(TORQUE_DISABLED_WARNINGS " ")
|
||||||
set(TORQUE_CXX_FLAGS "/MP /O2 /Ob2 /Oi /Ot /Oy /GT /Zi /W4 /nologo /GF /EHsc /GS- /Gy- /Qpar- /arch:SSE2 /fp:fast /fp:except- /GR /Zc:wchar_t- /wd4018 /wd4100 /wd4121 /wd4127 /wd4130 /wd4244 /wd4245 /wd4389 /wd4511 /wd4512 /wd4800 /wd4995 /D_CRT_SECURE_NO_WARNINGS " CACHE TYPE STRING)
|
set(TORQUE_CXX_FLAGS "/MP /O2 /Ob2 /Oi /Ot /Oy /GT /Zi /W4 /nologo /GF /EHsc /GS- /Gy- /Qpar- /arch:SSE2 /fp:fast /fp:except- /GR /Zc:wchar_t- /wd4018 /wd4100 /wd4121 /wd4127 /wd4130 /wd4244 /wd4245 /wd4389 /wd4511 /wd4512 /wd4800 /wd4995 /D_CRT_SECURE_NO_WARNINGS " CACHE TYPE STRING)
|
||||||
mark_as_advanced(TORQUE_CXX_FLAGS)
|
mark_as_advanced(TORQUE_CXX_FLAGS)
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORQUE_CXX_FLAGS}")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORQUE_CXX_FLAGS}")
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS}")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS}")
|
||||||
set(CMAKE_EXE_LINKER_FLAGS "/LARGEADDRESSAWARE")
|
set(CMAKE_EXE_LINKER_FLAGS "/LARGEADDRESSAWARE")
|
||||||
#set(STATIC_LIBRARY_FLAGS "/OPT:NOREF")
|
#set(STATIC_LIBRARY_FLAGS "/OPT:NOREF")
|
||||||
|
|
||||||
# Force static runtime libraries
|
# Force static runtime libraries
|
||||||
if(TORQUE_STATIC)
|
if(TORQUE_STATIC)
|
||||||
FOREACH(flag
|
FOREACH(flag
|
||||||
CMAKE_C_FLAGS_RELEASE
|
CMAKE_C_FLAGS_RELEASE
|
||||||
CMAKE_C_FLAGS_RELWITHDEBINFO
|
CMAKE_C_FLAGS_RELWITHDEBINFO
|
||||||
CMAKE_C_FLAGS_DEBUG
|
CMAKE_C_FLAGS_DEBUG
|
||||||
CMAKE_C_FLAGS_DEBUG_INIT
|
CMAKE_C_FLAGS_DEBUG_INIT
|
||||||
CMAKE_CXX_FLAGS_RELEASE
|
CMAKE_CXX_FLAGS_RELEASE
|
||||||
CMAKE_CXX_FLAGS_RELWITHDEBINFO
|
CMAKE_CXX_FLAGS_RELWITHDEBINFO
|
||||||
CMAKE_CXX_FLAGS_DEBUG
|
CMAKE_CXX_FLAGS_DEBUG
|
||||||
CMAKE_CXX_FLAGS_DEBUG_INIT)
|
CMAKE_CXX_FLAGS_DEBUG_INIT)
|
||||||
STRING(REPLACE "/MD" "/MT" "${flag}" "${${flag}}")
|
STRING(REPLACE "/MD" "/MT" "${flag}" "${${flag}}")
|
||||||
SET("${flag}" "${${flag}} /EHsc")
|
SET("${flag}" "${${flag}} /EHsc")
|
||||||
ENDFOREACH()
|
ENDFOREACH()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
# fix the debug/release subfolders on windows
|
# fix the debug/release subfolders on windows
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
FOREACH(CONF ${CMAKE_CONFIGURATION_TYPES})
|
FOREACH(CONF ${CMAKE_CONFIGURATION_TYPES})
|
||||||
# Go uppercase (DEBUG, RELEASE...)
|
# Go uppercase (DEBUG, RELEASE...)
|
||||||
STRING(TOUPPER "${CONF}" CONF)
|
STRING(TOUPPER "${CONF}" CONF)
|
||||||
#SET("CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CONF}" "${projectOutDir}")
|
#SET("CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CONF}" "${projectOutDir}")
|
||||||
SET("CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CONF}" "${projectOutDir}")
|
SET("CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CONF}" "${projectOutDir}")
|
||||||
ENDFOREACH()
|
ENDFOREACH()
|
||||||
endif()
|
endif()
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue