kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-24 13:15:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

build: remove enforcement of cmake build type

Browse Source 
Forcing the build type to be one of the default types was intended to
prevent usage of custom build types which risks unpredictability.
Unfortunately, many distributions patch this check out so they can use
a custom type anyway, making the check moot in the first place. Instead,
allow custom build types but don't try to accomodate them in the code:
we're making the assumption that anyone who wants to use a custom build
type will be able to set any additional necessary flags needed for their
specific system.
This commit is contained in:
dundargoc 2024-10-14 01:56:08 +02:00 committed by dundargoc
parent 8c532a9ea8
commit 573bcb2aaf
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmake/Util.cmake
View File

@ -175,8 +175,7 @@ function(add_target)
add_custom_target(${target} DEPENDS ${touch_file}) add_custom_target(${target} DEPENDS ${touch_file})
endfunction() endfunction()
# Set default build type to BUILD_TYPE. Also limit the list of allowable build # Set default build type to BUILD_TYPE.
# types to the ones defined in variable allowableBuildTypes.
# #
# The correct way to specify build type (for example Release) for # The correct way to specify build type (for example Release) for
# single-configuration generators (Make and Ninja) is to run # single-configuration generators (Make and Ninja) is to run
@ -193,28 +192,24 @@ endfunction()
# Passing CMAKE_BUILD_TYPE for multi-config generators will not only not be # Passing CMAKE_BUILD_TYPE for multi-config generators will not only not be
# used, but also generate a warning for the user. # used, but also generate a warning for the user.
function(set_default_buildtype BUILD_TYPE) function(set_default_buildtype BUILD_TYPE)
set(allowableBuildTypes Debug Release MinSizeRel RelWithDebInfo) set(defaultBuildTypes Debug Release MinSizeRel RelWithDebInfo)
if(NOT BUILD_TYPE IN_LIST allowableBuildTypes)
message(FATAL_ERROR "Invalid build type: ${BUILD_TYPE}")
endif()
get_property(isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) get_property(isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
if(isMultiConfig) if(isMultiConfig)
# Multi-config generators use the first element in CMAKE_CONFIGURATION_TYPES as the default build type # Multi-config generators use the first element in
list(INSERT allowableBuildTypes 0 ${BUILD_TYPE}) # CMAKE_CONFIGURATION_TYPES as the default build type
list(REMOVE_DUPLICATES allowableBuildTypes) list(INSERT defaultBuildTypes 0 ${BUILD_TYPE})
set(CMAKE_CONFIGURATION_TYPES ${allowableBuildTypes} PARENT_SCOPE) list(REMOVE_DUPLICATES defaultBuildTypes)
set(CMAKE_CONFIGURATION_TYPES ${defaultBuildTypes} PARENT_SCOPE)
if(CMAKE_BUILD_TYPE) if(CMAKE_BUILD_TYPE)
message(WARNING "CMAKE_BUILD_TYPE specified which is ignored on \ message(WARNING "CMAKE_BUILD_TYPE specified which is ignored on \
multi-configuration generators. Defaulting to ${BUILD_TYPE} build type.") multi-configuration generators. Defaulting to ${BUILD_TYPE} build type.")
endif() endif()
else() else()
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "${allowableBuildTypes}") set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "${defaultBuildTypes}")
if(NOT CMAKE_BUILD_TYPE) if(NOT CMAKE_BUILD_TYPE)
message(STATUS "CMAKE_BUILD_TYPE not specified, default is '${BUILD_TYPE}'") message(STATUS "CMAKE_BUILD_TYPE not specified, default is '${BUILD_TYPE}'")
set(CMAKE_BUILD_TYPE ${BUILD_TYPE} CACHE STRING "Choose the type of build" FORCE) set(CMAKE_BUILD_TYPE ${BUILD_TYPE} CACHE STRING "Choose the type of build" FORCE)
elseif(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes)
message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}")
else() else()
message(STATUS "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}") message(STATUS "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
endif() endif()