diff options
| author | Nicky <nicky.dasmijn@gmail.com> | 2022-05-07 17:29:16 +0200 |
|---|---|---|
| committer | Nicky <nicky.dasmijn@gmail.com> | 2022-05-07 17:29:16 +0200 |
| commit | 42820f834fcd68c40dc71f1be2a2b7d50096f148 (patch) | |
| tree | 1d8b28724735afe62d962090f77e4c277fb5e24d /indra/cmake | |
| parent | 07a7c4e1909749ca2f50d155c0de3fdfdbb34952 (diff) | |
Remove unused LL_ARCH/LL_ARCH_DIR
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/UI.cmake | 20 | ||||
| -rw-r--r-- | indra/cmake/Variables.cmake | 12 |
2 files changed, 1 insertions, 31 deletions
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index 066975a3d0..8529576fda 100644 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake @@ -51,23 +51,3 @@ target_include_directories( ll::uilibraries SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include ) - -# The following made no real sense -# - ${ARCH}_linux_INCLUDES was set in 00-Common.cmake, -# - Here ist is used, but as ${${LL_ARCH}_INCLUDES} -# It would make more sense to use one form ($LL_ARCH) -# Leave this out for the moment, but come back when looking at the Linux build - -#set(${ARCH}_linux_INCLUDES -# atk-1.0 -# glib-2.0 -# gstreamer-0.10 -# gtk-2.0 -# pango-1.0 -# ) -#foreach(include ${${LL_ARCH}_INCLUDES}) -# target_include_directories( ll::uilibraries SYSTEM INTERFACE -# ${LIBS_PREBUILT_DIR}/include/${include} -# ) -#endforeach(include) - diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 4f40516917..653db2069a 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -73,13 +73,11 @@ 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. if (ADDRESS_SIZE EQUAL 32) - #message(STATUS "ADDRESS_SIZE is 32") set(ARCH i686) elseif (ADDRESS_SIZE EQUAL 64) - #message(STATUS "ADDRESS_SIZE is 64") set(ARCH x86_64) else (ADDRESS_SIZE EQUAL 32) - # Note we cannnot use if(DARWIN) here, this variable is set way lower + # Note we cannot use if(DARWIN) here, this variable is set way lower if( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" ) set(ADDRESS_SIZE 64) set(ARCH x86_64) @@ -105,8 +103,6 @@ endif (ADDRESS_SIZE EQUAL 32) if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") set(WINDOWS ON BOOL FORCE) - set(LL_ARCH ${ARCH}_win32) - set(LL_ARCH_DIR ${ARCH}-win32) endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows") if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") @@ -133,9 +129,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") include(ConfigurePkgConfig) - set(LL_ARCH ${ARCH}_linux) - set(LL_ARCH_DIR ${ARCH}-linux) - if (INSTALL_PROPRIETARY) # Only turn on headless if we can find osmesa libraries. include(FindPkgConfig) @@ -204,9 +197,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(CMAKE_OSX_ARCHITECTURES "${ARCH}") string(REPLACE "i686" "i386" CMAKE_OSX_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES}") string(REPLACE "AMD64" "x86_64" CMAKE_OSX_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES}") - - set(LL_ARCH ${ARCH}_darwin) - set(LL_ARCH_DIR universal-darwin) endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # Default deploy grid |