From ca5e706ab4602b7de09c60a37ceb778810f67624 Mon Sep 17 00:00:00 2001 From: Robert MacGregor Date: Tue, 12 Oct 2021 13:19:28 -0400 Subject: [PATCH] * [CMake] BugFix: Clear several CMake warnings. --- Tools/CMake/basics.cmake | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Tools/CMake/basics.cmake b/Tools/CMake/basics.cmake index 952826d97..5a9fc0a42 100644 --- a/Tools/CMake/basics.cmake +++ b/Tools/CMake/basics.cmake @@ -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}") @@ -400,17 +400,17 @@ set(TORQUE_STATIC ON) #option(TORQUE_STATIC "enables or disable static" OFF) if(WIN32) - set(TORQUE_CXX_FLAGS_EXECUTABLES "/wd4018 /wd4100 /wd4121 /wd4127 /wd4130 /wd4244 /wd4245 /wd4389 /wd4511 /wd4512 /wd4800 /wd4995 " CACHE TYPE STRING) + set(TORQUE_CXX_FLAGS_EXECUTABLES "/wd4018 /wd4100 /wd4121 /wd4127 /wd4130 /wd4244 /wd4245 /wd4389 /wd4511 /wd4512 /wd4800 /wd4995 " CACHE STRING) mark_as_advanced(TORQUE_CXX_FLAGS_EXECUTABLES) - set(TORQUE_CXX_FLAGS_LIBS "/W0" CACHE TYPE STRING) + set(TORQUE_CXX_FLAGS_LIBS "/W0" CACHE STRING) mark_as_advanced(TORQUE_CXX_FLAGS_LIBS) set(TORQUE_CXX_FLAGS_COMMON_DEFAULT "-DUNICODE -D_UNICODE -D_CRT_SECURE_NO_WARNINGS /MP /O2 /Ob2 /Oi /Ot /Oy /GT /Zi /W4 /nologo /GF /EHsc /GS- /Gy- /Qpar- /fp:precise /fp:except- /GR /Zc:wchar_t-" ) if( TORQUE_CPU_X32 ) set(TORQUE_CXX_FLAGS_COMMON_DEFAULT "${TORQUE_CXX_FLAGS_COMMON_DEFAULT} /arch:SSE2") endif() - set(TORQUE_CXX_FLAGS_COMMON ${TORQUE_CXX_FLAGS_COMMON_DEFAULT} CACHE TYPE STRING) + set(TORQUE_CXX_FLAGS_COMMON ${TORQUE_CXX_FLAGS_COMMON_DEFAULT} CACHE STRING) mark_as_advanced(TORQUE_CXX_FLAGS_COMMON) @@ -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}")