|
|
@@ -364,10 +364,10 @@ macro(finishExecutable)
|
|
|
endmacro()
|
|
|
|
|
|
macro(setupVersionNumbers)
|
|
|
- set(TORQUE_APP_VERSION_MAJOR 1 CACHE INTEGER "")
|
|
|
- set(TORQUE_APP_VERSION_MINOR 0 CACHE INTEGER "")
|
|
|
- set(TORQUE_APP_VERSION_PATCH 0 CACHE INTEGER "")
|
|
|
- set(TORQUE_APP_VERSION_TWEAK 0 CACHE INTEGER "")
|
|
|
+ set(TORQUE_APP_VERSION_MAJOR 1 CACHE STRING "")
|
|
|
+ set(TORQUE_APP_VERSION_MINOR 0 CACHE STRING "")
|
|
|
+ set(TORQUE_APP_VERSION_PATCH 0 CACHE STRING "")
|
|
|
+ set(TORQUE_APP_VERSION_TWEAK 0 CACHE STRING "")
|
|
|
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}")
|
|
|
set(TORQUE_APP_VERSION_STRING "${TORQUE_APP_VERSION_MAJOR}.${TORQUE_APP_VERSION_MINOR}.${TORQUE_APP_VERSION_PATCH}.${TORQUE_APP_VERSION_TWEAK}")
|
|
|
@@ -436,11 +436,11 @@ if(WIN32)
|
|
|
endif()
|
|
|
else()
|
|
|
# TODO: improve default settings on other platforms
|
|
|
- set(TORQUE_CXX_FLAGS_EXECUTABLES "" CACHE TYPE STRING)
|
|
|
+ set(TORQUE_CXX_FLAGS_EXECUTABLES "" CACHE STRING "")
|
|
|
mark_as_advanced(TORQUE_CXX_FLAGS_EXECUTABLES)
|
|
|
- set(TORQUE_CXX_FLAGS_LIBS "" CACHE TYPE STRING)
|
|
|
+ set(TORQUE_CXX_FLAGS_LIBS "" CACHE STRING "")
|
|
|
mark_as_advanced(TORQUE_CXX_FLAGS_LIBS)
|
|
|
- set(TORQUE_CXX_FLAGS_COMMON "" CACHE TYPE STRING)
|
|
|
+ set(TORQUE_CXX_FLAGS_COMMON "" CACHE STRING "")
|
|
|
mark_as_advanced(TORQUE_CXX_FLAGS)
|
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORQUE_CXX_FLAGS}")
|
|
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS}")
|