From c8290b913e23d3202adbf513da642d8277ca6abb Mon Sep 17 00:00:00 2001 From: Router Gray Date: Fri, 27 Dec 2019 06:16:59 -0600 Subject: [PATCH] [CMake] Change remaining WORD_SIZE references to ADDDRESS_SIZE. --- autobuild.xml | 10 +++++----- indra/cmake/00-Common.cmake | 14 +++++++------- indra/cmake/ConfigurePkgConfig.cmake | 6 +++--- indra/cmake/GooglePerfTools.cmake | 8 ++++---- indra/cmake/NVAPI.cmake | 6 +++--- indra/cmake/Variables.cmake | 1 - indra/newview/CMakeLists.txt | 6 +++--- 7 files changed, 25 insertions(+), 26 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 125c014e5..417691851 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2771,7 +2771,7 @@ options -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo - -DWORD_SIZE:STRING=$AUTOBUILD_ADDRSIZE + -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE -DROOT_PROJECT_NAME:STRING=Singularity -DINSTALL_PROPRIETARY=FALSE @@ -2792,7 +2792,7 @@ options -DCMAKE_BUILD_TYPE:STRING=Release - -DWORD_SIZE:STRING=$AUTOBUILD_ADDRSIZE + -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE -DROOT_PROJECT_NAME:STRING=Singularity -DINSTALL_PROPRIETARY=FALSE @@ -2943,7 +2943,7 @@ -G Ninja - -DWORD_SIZE:STRING=64 + -DADDRESS_SIZE:STRING=64 default @@ -2968,7 +2968,7 @@ -G Ninja - -DWORD_SIZE:STRING=64 + -DADDRESS_SIZE:STRING=64 name @@ -3068,7 +3068,7 @@ name - windows64 + windows version_file diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 6dddeed57..653c72412 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -39,9 +39,9 @@ if (WINDOWS) "${CMAKE_C_FLAGS_RELEASE} ${LL_C_FLAGS} /O2 /Zi /MD /MP /fp:fast" CACHE STRING "C compiler release options" FORCE) - if (WORD_SIZE EQUAL 32) + if (ADDRESS_SIZE EQUAL 32) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE") - endif (WORD_SIZE EQUAL 32) + endif (ADDRESS_SIZE EQUAL 32) if (FULL_DEBUG_SYMS OR USE_CRASHPAD) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG:FULL") @@ -103,9 +103,9 @@ if (WINDOWS) ) endif (USE_LTO) - if (WORD_SIZE EQUAL 32) + if (ADDRESS_SIZE EQUAL 32) add_compile_options(/arch:SSE2) - endif (WORD_SIZE EQUAL 32) + endif (ADDRESS_SIZE EQUAL 32) if (NOT DISABLE_FATAL_WARNINGS) add_definitions(/WX) @@ -292,13 +292,13 @@ if (LINUX OR DARWIN) set(CMAKE_C_FLAGS "${UNIX_WARNINGS} ${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "${UNIX_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}") - if (WORD_SIZE EQUAL 32) + if (ADDRESS_SIZE EQUAL 32) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") - elseif (WORD_SIZE EQUAL 64) + elseif (ADDRESS_SIZE EQUAL 64) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64") - endif (WORD_SIZE EQUAL 32) + endif (ADDRESS_SIZE EQUAL 32) endif (LINUX OR DARWIN) diff --git a/indra/cmake/ConfigurePkgConfig.cmake b/indra/cmake/ConfigurePkgConfig.cmake index afbc36d63..a2d5b31e2 100644 --- a/indra/cmake/ConfigurePkgConfig.cmake +++ b/indra/cmake/ConfigurePkgConfig.cmake @@ -6,17 +6,17 @@ SET(DEBUG_PKG_CONFIG "YES") IF("$ENV{PKG_CONFIG_LIBDIR}" STREQUAL "") # Guess at architecture-specific system library paths. - if (WORD_SIZE EQUAL 32) + if (ADDRESS_SIZE EQUAL 32) SET(PKG_CONFIG_NO_MULTI_GUESS /usr/lib32 /usr/lib) SET(PKG_CONFIG_NO_MULTI_LOCAL_GUESS /usr/local/lib32 /usr/local/lib) SET(PKG_CONFIG_MULTI_GUESS /usr/lib/i386-linux-gnu) SET(PKG_CONFIG_MULTI_LOCAL_GUESS /usr/local/lib/i386-linux-gnu) - else (WORD_SIZE EQUAL 32) + else (ADDRESS_SIZE EQUAL 32) SET(PKG_CONFIG_NO_MULTI_GUESS /usr/lib64 /usr/lib) SET(PKG_CONFIG_NO_MULTI_LOCAL_GUESS /usr/local/lib64 /usr/local/lib) SET(PKG_CONFIG_MULTI_GUESS /usr/lib/x86_64-linux-gnu) SET(PKG_CONFIG_MULTI_LOCAL_GUESS /usr/local/lib/x86_64-linux-gnu) - endif (WORD_SIZE EQUAL 32) + endif (ADDRESS_SIZE EQUAL 32) # Use DPKG architecture, if available. IF (${DPKG_ARCH}) diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 49ff3f5eb..d951bc55e 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -2,16 +2,16 @@ include(Prebuilt) -if(WORD_SIZE EQUAL 64) +if(ADDRESS_SIZE EQUAL 64) set(DISABLE_TCMALLOC TRUE) -endif(WORD_SIZE EQUAL 64) +endif(ADDRESS_SIZE EQUAL 64) if (STANDALONE) include(FindGooglePerfTools) else (STANDALONE) - if (LINUX OR WINDOWS AND NOT WORD_SIZE EQUAL 64) + if (LINUX OR WINDOWS AND NOT ADDRESS_SIZE EQUAL 64) use_prebuilt_binary(gperftools) - endif (LINUX OR WINDOWS AND NOT WORD_SIZE EQUAL 64) + endif (LINUX OR WINDOWS AND NOT ADDRESS_SIZE EQUAL 64) if (WINDOWS AND NOT DISABLE_TCMALLOC) set(TCMALLOC_LIBRARIES libtcmalloc_minimal.lib) set(TCMALLOC_LINKER_FLAGS "/INCLUDE:\"__tcmalloc\"") diff --git a/indra/cmake/NVAPI.cmake b/indra/cmake/NVAPI.cmake index 83d1ef643..3cdf5ca47 100644 --- a/indra/cmake/NVAPI.cmake +++ b/indra/cmake/NVAPI.cmake @@ -5,11 +5,11 @@ include(Variables) if (USE_NVAPI) if (WINDOWS) use_prebuilt_binary(nvapi) - if (WORD_SIZE EQUAL 32) + if (ADDRESS_SIZE EQUAL 32) set(NVAPI_LIBRARY nvapi) - elseif (WORD_SIZE EQUAL 64) + elseif (ADDRESS_SIZE EQUAL 64) set(NVAPI_LIBRARY nvapi64) - endif (WORD_SIZE EQUAL 32) + endif (ADDRESS_SIZE EQUAL 32) else (WINDOWS) set(NVAPI_LIBRARY "") endif (WINDOWS) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index dc0d5a6b0..b1afa31e2 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -119,7 +119,6 @@ endif (NOT CMAKE_BUILD_TYPE) # If someone has specified an address size, use that to determine the # architecture. Otherwise, let the architecture specify the address size. -set(ADDRESS_SIZE ${WORD_SIZE}) if (ADDRESS_SIZE EQUAL 32) #message(STATUS "ADDRESS_SIZE is 32") set(ARCH i686) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index b8de567a4..54c9329b5 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1532,18 +1532,18 @@ if (WINDOWS) endif (ADDRESS_SIZE EQUAL 64) if (USE_FMODSTUDIO) - if (WORD_SIZE EQUAL 64) + if (ADDRESS_SIZE EQUAL 64) list(APPEND COPY_INPUT_DEPENDENCIES ${SHARED_LIB_STAGING_DIR}/Release/fmod64.dll ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/fmod64.dll ${SHARED_LIB_STAGING_DIR}/Debug/fmodL64.dll ) - else (WORD_SIZE EQUAL 64) + else (ADDRESS_SIZE EQUAL 64) list(APPEND COPY_INPUT_DEPENDENCIES ${SHARED_LIB_STAGING_DIR}/Release/fmod.dll ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/fmod.dll ) - endif (WORD_SIZE EQUAL 64) + endif (ADDRESS_SIZE EQUAL 64) endif (USE_FMODSTUDIO) if(MSVC_IDE)