Skip to content

Fix cmake autooptions #10456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmcfarlen merged 1 commit into from
Sep 19, 2023
Merged

Fix cmake autooptions #10456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ auto_option(HWLOC FEATURE_VAR TS_USE_HWLOC PACKAGE_DEPENDS hwloc)
auto_option(JEMALLOC
FEATURE_VAR TS_HAS_JEMALLOC
PACKAGE_DEPENDS jemalloc
DEFAULT OFF
)
auto_option(MIMALLOC
FEATURE_VAR TS_HAS_MIMALLOC
Expand Down Expand Up @@ -204,11 +203,6 @@ else()
endif()
set(HAVE_SYS_CAPABILITY_H ${cap_FOUND})

find_package(hwloc)
if(hwloc_FOUND)
set(TS_USE_HWLOC TRUE)
endif()

find_package(LibLZMA)
if(LibLZMA_FOUND)
set(HAVE_LZMA_H TRUE)
Expand Down
10 changes: 7 additions & 3 deletions cmake/AutoOptionHelpers.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,12 @@ endfunction()

macro(_CHECK_PACKAGE_DEPENDS _OPTION_VAR _PACKAGE_DEPENDS _FEATURE_VAR)
if(${${_OPTION_VAR}} STREQUAL AUTO)
set(STRICTNESS QUIET)
set(STRICTNESS)
else()
set(STRICTNESS REQUIRED)
endif()


foreach(PACKAGE_NAME ${_PACKAGE_DEPENDS})
find_package(${PACKAGE_NAME} ${STRICTNESS})
if(NOT ${PACKAGE_NAME}_FOUND)
Expand Down Expand Up @@ -97,7 +98,10 @@ macro(auto_option _FEATURE_NAME)
set(FEATURE_VAR "USE_${_FEATURE_NAME}")
endif()

if(NOT ARG_DEFAULT)

if(ARG_DEFAULT STREQUAL OFF)
set(DEFAULT OFF)
elseif(NOT ARG_DEFAULT)
set(DEFAULT AUTO)
elseif(ARG_DEFAULT MATCHES "(ON)|(AUTO)|(TRUE)|(1)")
set(DEFAULT ${ARG_DEFAULT})
Expand All @@ -107,7 +111,7 @@ macro(auto_option _FEATURE_NAME)

_register_auto_option(${OPTION_VAR} ${FEATURE_VAR} "${ARG_DESCRIPTION}" "${DEFAULT}")

if(${${OPTION_VAR}})
if(${${OPTION_VAR}} MATCHES "(ON)|(AUTO)|(TRUE)|(1)")
set(${FEATURE_VAR} TRUE)
_check_package_depends(${OPTION_VAR} "${ARG_PACKAGE_DEPENDS}" ${FEATURE_VAR})
else()
Expand Down