remove architecture checks from mkspecs file [ci skip]

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-01-01 14:54:30 +00:00
parent 86ce17c2cf
commit 49f79f4480
2 changed files with 11 additions and 47 deletions

View file

@ -75,6 +75,13 @@ set(KATIE_VERSION "${KATIE_MAJOR}.${KATIE_MINOR}.${KATIE_MICRO}")
# this one is set via macro later, if possible. also used in config.cpp.cmake
set(KATIE_GIT "unstable-${KATIE_VERSION}")
# only for the build process
if(CMAKE_SYSTEM_PROCESSOR)
string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" KATIE_PROCESSOR)
elseif(CMAKE_HOST_SYSTEM_PROCESSOR)
string(TOLOWER "${CMAKE_HOST_SYSTEM_PROCESSOR}" KATIE_PROCESSOR)
endif()
# components and tools that will be build, changed depending on the requirements availability
# NOTE: excluding DesignerComponents as it was never used as public component, currently only
# used by the the designer tool. if it is ever needed for something it can just be added here
@ -931,13 +938,13 @@ configure_file(
configure_file(
${CMAKE_SOURCE_DIR}/cmake/ld.so.conf.cmake
${CMAKE_BINARY_DIR}/katie-${KATIE_ARCHITECTURE}.conf
${CMAKE_BINARY_DIR}/katie-${KATIE_PROCESSOR}.conf
@ONLY
)
configure_file(
${CMAKE_SOURCE_DIR}/cmake/profile.sh.cmake
${CMAKE_BINARY_DIR}/katie-${KATIE_ARCHITECTURE}.sh
${CMAKE_BINARY_DIR}/katie-${KATIE_PROCESSOR}.sh
@ONLY
)
@ -974,13 +981,13 @@ install(
)
install(
FILES ${CMAKE_BINARY_DIR}/katie-${KATIE_ARCHITECTURE}.conf
FILES ${CMAKE_BINARY_DIR}/katie-${KATIE_PROCESSOR}.conf
DESTINATION ${KATIE_LDCONF_RELATIVE}
COMPONENT Runtime
)
install(
FILES ${CMAKE_BINARY_DIR}/katie-${KATIE_ARCHITECTURE}.sh
FILES ${CMAKE_BINARY_DIR}/katie-${KATIE_PROCESSOR}.sh
DESTINATION ${KATIE_PROFILE_RELATIVE}
COMPONENT Runtime
)

View file

@ -33,49 +33,6 @@ if(NOT KATIE_COMPILER)
endif()
endif()
if(NOT KATIE_ARCHITECTURE)
if(CMAKE_SYSTEM_PROCESSOR)
string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} lowercase_processor)
elseif(CMAKE_HOST_SYSTEM_PROCESSOR)
string(TOLOWER ${CMAKE_HOST_SYSTEM_PROCESSOR} lowercase_processor)
endif()
# https://en.wikipedia.org/wiki/Uname
if(lowercase_processor MATCHES "^alpha")
set(KATIE_ARCHITECTURE "alpha")
elseif(lowercase_processor MATCHES "^arm")
set(KATIE_ARCHITECTURE "arm")
elseif(lowercase_processor MATCHES "^avr")
set(KATIE_ARCHITECTURE "avr")
elseif(lowercase_processor MATCHES "^blackfin")
set(KATIE_ARCHITECTURE "blackfin")
elseif(lowercase_processor MATCHES "(x86|i[3-6]86|i86pc)")
set(KATIE_ARCHITECTURE "i386")
elseif(lowercase_processor MATCHES "^ia64")
set(KATIE_ARCHITECTURE "ia64")
elseif(lowercase_processor MATCHES "^m68k")
set(KATIE_ARCHITECTURE "m68k")
elseif(lowercase_processor MATCHES "^mips")
set(KATIE_ARCHITECTURE "mips")
elseif(lowercase_processor MATCHES "^nacl")
set(KATIE_ARCHITECTURE "nacl")
elseif(lowercase_processor MATCHES "^hppa")
set(KATIE_ARCHITECTURE "parisc")
elseif(lowercase_processor MATCHES "^ppc")
set(KATIE_ARCHITECTURE "powerpc")
elseif(lowercase_processor MATCHES "^s390")
set(KATIE_ARCHITECTURE "s390")
elseif(lowercase_processor MATCHES "^sparc")
set(KATIE_ARCHITECTURE "sparc")
elseif(lowercase_processor MATCHES "^sh")
set(KATIE_ARCHITECTURE "sh")
elseif(lowercase_processor MATCHES "(x86_64|amd64)")
set(KATIE_ARCHITECTURE "x86_64")
else()
message(FATAL_ERROR "Unknown CPU '${CMAKE_SYSTEM_PROCESSOR}' (${CMAKE_HOST_SYSTEM_PROCESSOR})")
endif()
endif()
if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
katie_definition(-DQT_NO_DEBUG)
endif()